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

minibar: word-for-word replacement fixes

Browse Source 
Check that the reconstructed abstract syntax tree is type correct before
enabling word-for-word replacement. Show an error message if word replacement
nevertheless fails.
This commit is contained in:
hallgren
2012-03-22 14:33:42 +00:00
parent f899d54057
commit 68b8a78e76
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/www/minibar/minibar_input.js
View File

@@ -309,11 +309,17 @@ Input.prototype.get_tree1=function(parse_output) {
} }
Input.prototype.get_tree2=function(lin) { Input.prototype.get_tree2=function(lin) {
with(this) { var t=this;
with(t) {
if(lin.length==1 && lin[0].to==current.from if(lin.length==1 && lin[0].to==current.from
&& lin[0].text+" "==current.input && lin[0].text+" "==current.input
&& lin[0].brackets) && (lin[0].brackets)) {
enable_structural_editing(lin[0].brackets) var bs=lin[0].brackets;
var tree=show_abstract_tree(bs);
function proceed() { t.enable_structural_editing(bs) }
server.linearize({to:current.from,tree:tree},
proceed,bind(end_structural_editing,t))
}
else end_structural_editing(); else end_structural_editing();
} }
} }
@@ -343,7 +349,7 @@ Input.prototype.enable_structural_editing=function(brackets) {
else b.children.map(function(c){add_bs(c,b)}) else b.children.map(function(c){add_bs(c,b)})
} }
var typed=surface.typed; var typed=surface.typed;
surface.innerHTML=""; clear(surface)
add_bs(brackets); add_bs(brackets);
t.surface.structural_editing_enabled=true; t.surface.structural_editing_enabled=true;
if(typed) surface.appendChild(typed); if(typed) surface.appendChild(typed);
@@ -369,7 +375,7 @@ Input.prototype.show_replacements=function(brackets,parent) {
t.browse(rfun,browse3) t.browse(rfun,browse3)
} }
var ps=cat_info.producers; var ps=cat_info.producers;
t.words.innerHTML=""; clear(t.words);
if(ps) if(ps)
for(var pi in ps) for(var pi in ps)
if(ps[pi]!=fun) examine_replacement(ps[pi]) if(ps[pi]!=fun) examine_replacement(ps[pi])
@@ -391,7 +397,13 @@ Input.prototype.replace_word=function(brackets,parent,fun) {
t.add_words(lin_output[0].text) t.add_words(lin_output[0].text)
} }
} }
server.linearize({to:current.from,tree:tree},replace) function err(text,status,ctype) {
t.words.innerHTML=
ctype.split(";")[0]=="text/html"
? text
: "Word replacement failed"
}
server.linearize({to:current.from,tree:tree},replace,err)
} }
} }
@@ -403,7 +415,7 @@ Input.prototype.browse=function(id,cont) {
t.grammar.browse[id]=info; t.grammar.browse[id]=info;
cont(info); cont(info);
} }
server.pgf_call("browse",{id:id,format:"json"},browsed); server.browse(id,browsed);
} }
} }