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

Rename children to args in VoiceXML/SISR/JavaScript.

Browse Source
This commit is contained in:
bringert
2007-01-22 20:48:14 +00:00
parent 6bbc7e804f
commit 979a54af35
3 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/javascript/gflib.js
View File

@@ -1,7 +1,7 @@
/* Abstract syntax trees */
function Fun(name) {
this.name = name;
this.children = copy_arguments(arguments, 1);
this.args = copy_arguments(arguments, 1);
}
Fun.prototype.print = function () { return this.show(0); } ;
Fun.prototype.show = function (prec) {
@@ -17,7 +17,7 @@ Fun.prototype.show = function (prec) {
}
} else {
var s = this.name;
var cs = this.children;
var cs = this.args;
for (var i in cs) {
s += " " + cs[i].show(1);
}
@@ -27,11 +27,11 @@ Fun.prototype.show = function (prec) {
return s;
}
};
Fun.prototype.getChild = function (i) {
return this.children[i];
Fun.prototype.getArg = function (i) {
return this.args[i];
};
Fun.prototype.setChild = function (i,c) {
this.children[i] = c;
Fun.prototype.setArg = function (i,c) {
this.args[i] = c;
};
Fun.prototype.isMeta = function() {
return this.name == '?';
@@ -40,8 +40,8 @@ Fun.prototype.isComplete = function() {
if (this.isMeta()) {
return false;
} else {
for (var i in tree.children) {
if (!tree.children[i].isComplete()) {
for (var i in tree.args) {
if (!tree.args[i].isComplete()) {
return false;
}
}
@@ -94,8 +94,8 @@ Abstract.prototype.annotate = function(tree, type) {
tree.type = type;
} else {
var typ = this.types[tree.name];
for (var i in tree.children) {
this.annotate(tree.children[i], typ.args[i]);
for (var i in tree.args) {
this.annotate(tree.args[i], typ.args[i]);
}
}
return tree;
@@ -106,10 +106,10 @@ Abstract.prototype.copyTree = function(x) {
if (!isUndefined(x.type)) {
t.type = x.type;
}
var cs = x.children;
var cs = x.args;
if (!isUndefined(cs)) {
for (var i in cs) {
t.setChild(i, this.copyTree(cs[i]));
t.setArg(i, this.copyTree(cs[i]));
}
}
return t;
@@ -131,7 +131,7 @@ Abstract.prototype.parseTree_ = function(tokens, prec) {
if (prec == 0) {
var c, i;
for (i = 0; (c = this.parseTree_(tokens, 1)) !== null; i++) {
tree.setChild(i,c);
tree.setArg(i,c);
}
}
return tree;
@@ -162,8 +162,8 @@ Concrete.prototype.linearizeToTerm = function (tree) {
}
} else {
var cs = new Array();
for (var i in tree.children) {
cs.push(this.linearizeToTerm(tree.children[i]));
for (var i in tree.args) {
cs.push(this.linearizeToTerm(tree.args[i]));
}
return this.rule(tree.name, cs);
}

2
src/GF/Speech/GrammarToVoiceXML.hs
View File

@@ -161,7 +161,7 @@ fun2sub gr cat fun args =
[param "old" v,
filled [] [assign v (s++".term")]]
where s = prid fun ++ "_" ++ show n
v = "term.children["++show n++"]"
v = "term.args["++show n++"]"
catFormId :: VIdent -> String
catFormId c = prid c ++ "_cat"

26
src/GF/Speech/SISR.hs
View File

@@ -43,20 +43,20 @@ topCatSISR c fmt = map JS.DExpr [fmtOut fmt `ass` fmtRef fmt c]
profileInitSISR :: CFTerm -> SISRFormat -> SISRTag
profileInitSISR t fmt
| null (usedChildren t) = []
| otherwise = [JS.Decl [JS.DInit children (JS.EArray [])]]
| null (usedArgs t) = []
| otherwise = [JS.Decl [JS.DInit args (JS.EArray [])]]
usedChildren :: CFTerm -> [Int]
usedChildren (CFObj _ ts) = foldr union [] (map usedChildren ts)
usedChildren (CFAbs _ x) = usedChildren x
usedChildren (CFApp x y) = usedChildren x `union` usedChildren y
usedChildren (CFRes i) = [i]
usedChildren _ = []
usedArgs :: CFTerm -> [Int]
usedArgs (CFObj _ ts) = foldr union [] (map usedArgs ts)
usedArgs (CFAbs _ x) = usedArgs x
usedArgs (CFApp x y) = usedArgs x `union` usedArgs y
usedArgs (CFRes i) = [i]
usedArgs _ = []
catSISR :: CFTerm -> SRGNT -> SISRFormat -> SISRTag
catSISR t (c,i) fmt
| i `elem` usedChildren t = map JS.DExpr
[JS.EIndex (JS.EVar children) (JS.EInt (fromIntegral i)) `ass` fmtRef fmt c]
| i `elem` usedArgs t = map JS.DExpr
[JS.EIndex (JS.EVar args) (JS.EInt (fromIntegral i)) `ass` fmtRef fmt c]
| otherwise = []
profileFinalSISR :: CFTerm -> SISRFormat -> SISRTag
@@ -65,7 +65,7 @@ profileFinalSISR term fmt = [JS.DExpr $ fmtOut fmt `ass` f term]
f (CFObj n ts) = tree (prIdent n) (map f ts)
f (CFAbs v x) = JS.EFun [var v] [JS.SReturn (f x)]
f (CFApp x y) = JS.ECall (f x) [f y]
f (CFRes i) = JS.EIndex (JS.EVar children) (JS.EInt (fromIntegral i))
f (CFRes i) = JS.EIndex (JS.EVar args) (JS.EInt (fromIntegral i))
f (CFVar v) = JS.EVar (var v)
f (CFConst s) = JS.EStr s
f (CFMeta typ) = obj [("name",JS.EStr "?"), ("type",JS.EStr typ)]
@@ -74,7 +74,7 @@ fmtOut SISROld = JS.EVar (JS.Ident "$")
fmtRef SISROld c = JS.EVar (JS.Ident ("$" ++ c))
children = JS.Ident "c"
args = JS.Ident "a"
var v = JS.Ident ("x" ++ show v)
@@ -82,7 +82,7 @@ field x y = JS.EMember x (JS.Ident y)
ass = JS.EAssign
tree n xs = obj [("name", JS.EStr n), ("children", JS.EArray xs)]
tree n xs = obj [("name", JS.EStr n), ("args", JS.EArray xs)]
obj ps = JS.EObj [JS.Prop (JS.Ident x) y | (x,y) <- ps]