gfse: show the types of linearization functions when hovering over their names

2 files changed, 77 insertions, 16 deletions

diff --git a/src/www/gfse/editor.js b/src/www/gfse/editor.js
index f146dbae3..bbca6a849 100644
--- a/src/www/gfse/editor.js
+++ b/src/www/gfse/editor.js
@@ -5,6 +5,14 @@ var compiler_output=element("compiler_output")
 
 /* -------------------------------------------------------------------------- */
 
+var grammar_cache=[]
+
+function reget_grammar(ix) { return grammar_cache[ix]=local.get(ix) }
+function get_grammar(ix)   { return grammar_cache[ix] || reget_grammar(ix) }
+function put_grammar(ix,g) { grammar_cache[ix]=g; local.put(ix,g) }
+
+/* -------------------------------------------------------------------------- */
+
 function initial_view() {
     var current=local.get("current");
     if(current>0) open_grammar(current-1);
@@ -96,18 +104,18 @@ function remove_local_grammar(i) {
 	local.count--;
 }
 
-function delete_grammar(i) {
-    var g=local.get(i);
+function delete_grammar(ix) {
+    var g=get_grammar(ix);
     var ok=confirm("Do you really want to delete the grammar "+g.basename+"?")
     if(ok) {
-	remove_local_grammar(i)
+	remove_local_grammar(ix)
 	remove_cloud_grammar(g)
 	initial_view();
     }
 }
 
 function clone_grammar(i) {
-    var old=local.get(i);
+    var old=get_grammar(i);
     var g={basename:old.basename,extends:old.extends || [],
 	   abstract:old.abstract,concretes:old.concretes}
     save_grammar(g); // we rely on the serialization to eliminate sharing
@@ -115,7 +123,7 @@ function clone_grammar(i) {
 }
 
 function open_grammar(i) {
-    var g=local.get(i);
+    var g=get_grammar(i);
     g.index=i;
     local.put("current",i+1);
     edit_grammar(g);
@@ -490,7 +498,7 @@ function adjust_opens(cnc,oldcode,code) {
 }
 
 function add_concrete2(ix,code) {
-    var g=local.get(ix);
+    var g=get_grammar(ix);
     var cs=g.concretes;
     var ci;
     for(var ci=0;ci<cs.length;ci++) if(cs[ci].langcode==code) break;
@@ -498,7 +506,7 @@ function add_concrete2(ix,code) {
 	if(g.current>0) {
 	    cs.push(cs[g.current-1]); // old and new are shared at this point
 	    save_grammar(g); // serialization loses sharing
-	    g=local.get(ix); // old and new are separate now
+	    g=reget_grammar(ix); // old and new are separate now
 	    var oldcode=cs[g.current-1].langcode;
 	    var cnc=g.concretes[ci];
 	    cnc.langcode=code;
@@ -629,8 +637,8 @@ function add_extends(g,el) {
 }
 
 function add_extends2(gix,igix) {
-    var g=local.get(gix);
-    var ig=local.get(igix);
+    var g=get_grammar(gix);
+    var ig=get_grammar(igix);
     if(!g.extends) g.extends=[];
     g.extends.push(ig.basename);
     //timestamp(g)
@@ -980,7 +988,7 @@ function add_open(ci) {
 }
 
 function add_open2(ix,ci,m) {
-    var g=local.get(ix);
+    var g=get_grammar(ix);
     var conc=g.concretes[ci];
     conc.opens || (conc.opens=[]);
     conc.opens.push(m);
@@ -1264,6 +1272,8 @@ function arg_names(type) {
 
 function draw_lins(g,ci) {
     var conc=g.concretes[ci];
+    var igs=inherited_grammars(g)
+    var dc=defined_cats(g);
     function edit(f) {
 	return function(g,el) {
 	    function check(s,cont) {
@@ -1283,10 +1293,18 @@ function draw_lins(g,ci) {
     }
     function del(fun) { return function () { delete_lin(g,ci,fun); } }
     function dl(f,cls) {
-	var l=[ident(f.fun)]
-	for(var i in f.args) {
+	var fn=ident(f.fun)
+	var fty=function_type(g,f.fun)
+	var linty=lintype(g,conc,igs,dc,fty)
+	if(fty)
+	    fn.title=f.fun+": "+show_type(fty)
+                    +"\nlin "+f.fun+": "+show_lintype(linty)
+	var l=[fn]
+	for(var i=0; i<f.args.length;i++) {
 	    l.push(text(" "));
-	    l.push(ident(f.args[i]));
+	    var an=ident(f.args[i])
+	    an.title=f.args[i]+": "+linty[i]
+	    l.push(an);
 	}
 	l.push(sep(" = "));
 	var t=editable("span",text_ne(f.lin),g,edit(f),"Edit lin for "+f.fun);
@@ -1322,6 +1340,35 @@ function draw_lins(g,ci) {
 	ls.push(dtmpl(f));
     return indent_sortable(ls,sort_lins);
 }
+
+
+// Return the linearization type for the given abtract type in the given 
+// concrete syntax, taking into account that lincats may be defined in
+// inherited grammars.
+// lintype :: Grammar -> Concrete -> [Grammar] -> {Cat=>ModId} => Type -> [Term]
+function lintype(g,conc,igs,dc,type) {
+    console.log(dc)
+    function ihcat_lincat(cat) {
+	if(dc[cat]=="Predef") return "{s:Str}" // !!! Is this right?
+	var ig=find_grammar_byname(igs,dc[cat])
+	if(!ig) return "??"
+	var iconc=ig.concretes[conc_index(ig,conc.langcode)]
+	if(!iconc) return "??"
+	return cat_lincat(iconc,cat) || "??"
+    }
+    function lincat(cat) {
+	return dc[cat]
+	    ? (dc[cat]==g.basename ? cat_lincat(conc,cat) : ihcat_lincat(cat))
+	    : cat+"??"
+    }
+    return type.map(lincat)
+}
+
+function find_grammar_byname(igs,name) {
+    for(var i in igs) if(igs[i].basename==name) return igs[i]
+    return null
+}
+
 /* -------------------------------------------------------------------------- */
 
 function draw_matrix(g) {
@@ -1417,7 +1464,7 @@ function cached_grammar_byname() {
 function cached_grammar_array_byname() {
     var gix={};
     for(var i=0;i<local.count;i++) {
-	var g=local.get(i,null);
+	var g=get_grammar(i,null);
 	if(g) gix[g.basename]=g; // basenames are not necessarily unique!!
     }
     return gix
@@ -1457,7 +1504,7 @@ function grammar_index() {
 }
 
 function merge_grammar(i,newg) {
-    var oldg=local.get(i);
+    var oldg=get_grammar(i);
     var keep="";
     debug("Merging at "+i);
     if(oldg) {
diff --git a/src/www/gfse/gf_abs.js b/src/www/gfse/gf_abs.js
index caa83fa90..4ab02250b 100644
--- a/src/www/gfse/gf_abs.js
+++ b/src/www/gfse/gf_abs.js
@@ -27,6 +27,7 @@ type Lin = {fun: FunId, args: [Id], lin: Term}
 type Lhs = String -- name and type of oper,
                   -- e.g "regN : Str -> { s:Str,g:Gender} ="
 type Term = String -- arbitrary GF term (not parsed by the editor)
+type LinType = [Term]
 */
 
 // locally_defined_cats :: Grammar -> {Cat=>ModId} -> {Cat=>ModId} // destr upd
@@ -86,7 +87,7 @@ function cat_lincat(conc,cat) {
 }
 
 // Return the lin defined in a given concrete syntax for an abstract function
-// cat_lincat :: Concrete -> FunId -> Lin
+// fun_lin :: Concrete -> FunId -> Lin
 function fun_lin(conc,fun) {
     with(conc) for(var i in lins) if(lins[i].fun==fun) return lins[i]
     return null;
@@ -225,6 +226,7 @@ function parse_oper(s) {
 
 /* --- Print as plain text (normal GF source syntax) ------------------------ */
 
+// show_type :: Type -> String
 function show_type(t) {
     var s="";
     for(var i in t) {
@@ -234,10 +236,22 @@ function show_type(t) {
     return s;
 }
 
+// show_lintype :: LinType -> String
+function show_lintype(t) {
+    var s="";
+    for(var i in t) {
+	if(i>0) s+=" -> ";
+	s+= check_id(t[i]) ? t[i] : "("+t[i]+")";
+    }
+    return s;
+}
+
+// show_fun :: Fun -> String
 function show_fun(fun) {
     return fun.name+" : "+show_type(fun.type);
 }
 
+// show_grammar :: Grammar -> String
 function show_grammar(g) {
     return show_abstract(g)+"\n"+show_concretes(g)
 }