msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

gfse: make categories from inherited grammars available in the startcat menu

Browse Source
This commit is contained in:
hallgren
2012-02-14 17:18:06 +00:00
parent 08b661bb59
commit 208a5ffc45
2 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/www/gfse/editor.js
View File

@@ -357,7 +357,10 @@ function draw_startcat(g) {
var abs=g.abstract; var abs=g.abstract;
var startcat = abs.startcat || abs.cats[0]; var startcat = abs.startcat || abs.cats[0];
function opt(cat) { return option(cat,cat); } function opt(cat) { return option(cat,cat); }
var m= node("select",{},map(opt,abs.cats)); var opts = g.extends && g.extends.length>0 ? [opt("-")] : [];
var dc=defined_cats(g);
for(var cat in dc) opts.push(opt(cat));
var m = node("select",{},opts);
m.value=startcat; m.value=startcat;
m.onchange=function() { m.onchange=function() {
if(m.value!=abs.startcat) { if(m.value!=abs.startcat) {
@@ -382,7 +385,8 @@ function draw_abstract(g) {
kw_cat.title = "The categories (nonterminals) of the grammar are enumerated here. [C.3.2]"; kw_cat.title = "The categories (nonterminals) of the grammar are enumerated here. [C.3.2]";
var kw_fun = kw("fun"); var kw_fun = kw("fun");
kw_fun.title = "The functions (productions) of the grammar are enumerated here. [C.3.4]"; kw_fun.title = "The functions (productions) of the grammar are enumerated here. [C.3.4]";
var flags=g.abstract.startcat || g.abstract.cats.length>1
var flags=g.abstract.startcat||g.abstract.cats.length>1||g.extends.length>0
? draw_startcat(g) ? draw_startcat(g)
: text(""); : text("");
function sort_funs() { function sort_funs() {
@@ -946,28 +950,14 @@ function draw_lins(g,ci) {
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
function defined_cats(g) { function defined_cats(g) { return all_defined_cats(g,inherited_grammars(g)) }
var grammar_byname=cached_grammar_byname(); function defined_funs(g) { return all_defined_funs(g,inherited_gramamrs(g)) }
var igs=(g.extends || []).map(grammar_byname) function inherited_cats(g) {return all_inherited_cats(inherited_grammars(g),{})}
return all_defined_cats(g,igs) function inherited_funs(g) {return all_inherited_funs(inherited_grammars(g),{})}
}
function inherited_cats(g) { function inherited_grammars(g) {
var grammar_byname=cached_grammar_byname(); var grammar_byname=cached_grammar_byname();
var igs=(g.extends || []).map(grammar_byname) return (g.extends || []).map(grammar_byname)
return all_inherited_cats(igs,{})
}
function defined_funs(g) {
var grammar_byname=cached_grammar_byname();
var igs=(g.extends || []).map(grammar_byname)
return all_defined_funs(g,igs)
}
function inherited_funs(g) {
var grammar_byname=cached_grammar_byname();
var igs=(g.extends || []).map(grammar_byname)
return all_inherited_funs(igs,{})
} }
function cached_grammar_byname() { function cached_grammar_byname() {

4
src/www/gfse/gf_abs.js
View File

@@ -247,7 +247,9 @@ function show_extends(exts) {
} }
function show_startcat(startcat) { function show_startcat(startcat) {
return startcat ? "flags startcat = "+startcat+";\n\n" : ""; return startcat && startcat!="-"
? "flags startcat = "+startcat+";\n\n"
: "";
} }
function show_cats(cats) { function show_cats(cats) {