Don't parse the strings "+" and "-" as numerical zeros. Also fix the

code generation of constant objects to use real identity and not Nasal
equality, so (e.g.) the constants 1 (number) and "1.0" (string) do not
get turned into the same object in the generated code.

diff --git a/simgear/nasal/codegen.c b/simgear/nasal/codegen.c
index e75f75f5c0d40716d8510bdf6ce5eeabcfc1e3da..fa605516f38c8a7f7f4d0367d28583b3dbbd43c4 100644 (file)
--- a/simgear/nasal/codegen.c
+++ b/simgear/nasal/codegen.c
@@ -40,31 +40,32 @@ static void genBinOp(int op, struct Parser* p, struct Token* t)
 
 static int newConstant(struct Parser* p, naRef c)
 {
-    int i = p->cg->nConsts++;
+    int i;
+    naVec_append(p->cg->consts, c);
+    i = naVec_size(p->cg->consts) - 1;
     if(i > 0xffff) naParseError(p, "too many constants in code block", 0);
-    naHash_set(p->cg->consts, naNum(i), c);
     return i;
 }
 
 static naRef getConstant(struct Parser* p, int idx)
 {
-    naRef c;
-    naHash_get(p->cg->consts, naNum(idx), &c);
-    return c;
+    return naVec_get(p->cg->consts, idx);
 }
 
 // Interns a scalar (!) constant and returns its index
 static int internConstant(struct Parser* p, naRef c)
 {
-    naRef r;
-    naHash_get(p->cg->interned, c, &r);
-    if(!IS_NIL(r)) {
-        return (int)r.num;
-    } else {
-        int idx = newConstant(p, c);
-        naHash_set(p->cg->interned, c, naNum(idx));
-        return idx;
+    int i, n = naVec_size(p->cg->consts);
+    for(i=0; i<n; i++) {
+        naRef b = naVec_get(p->cg->consts, i);
+        if(IS_NUM(b) && IS_NUM(c) && b.num == c.num)
+            return i;
+        if(IS_REF(b) && IS_REF(c) && b.ref.ptr.obj->type != c.ref.ptr.obj->type)
+            continue;
+        if(naEqual(b, c))
+            return i;
     }
+    return newConstant(p, c);
 }
 
 static void genScalarConstant(struct Parser* p, struct Token* t)
@@ -515,9 +516,7 @@ naRef naCodeGen(struct Parser* p, struct Token* t)
     cg.codeAlloced = 1024; // Start fairly big, this is a cheap allocation
     cg.byteCode = naParseAlloc(p, cg.codeAlloced);
     cg.nBytes = 0;
-    cg.consts = naNewHash(p->context);
-    cg.interned = naNewHash(p->context);
-    cg.nConsts = 0;
+    cg.consts = naNewVector(p->context);
     cg.loopTop = 0;
     p->cg = &cg;
 
@@ -530,7 +529,7 @@ naRef naCodeGen(struct Parser* p, struct Token* t)
     code->byteCode = naAlloc(cg.nBytes);
     for(i=0; i < cg.nBytes; i++)
         code->byteCode[i] = cg.byteCode[i];
-    code->nConstants = cg.nConsts;
+    code->nConstants = naVec_size(cg.consts);
     code->constants = naAlloc(code->nConstants * sizeof(naRef));
     code->srcFile = p->srcFile;
     for(i=0; i<code->nConstants; i++)

diff --git a/simgear/nasal/parse.h b/simgear/nasal/parse.h
index d4210ff4c20092bba0d9d19b91aec57eaf52f21b..24b89fcb6de3b4d379b46c1310cd6a7b98f94600 100644 (file)
--- a/simgear/nasal/parse.h
+++ b/simgear/nasal/parse.h
@@ -79,9 +79,7 @@ struct CodeGenerator {
     int loopTop;
 
     // Dynamic storage for constants, to be compiled into a static table
-    naRef consts;   // index -> naRef
-    naRef interned; // naRef -> index (scalars only!)
-    int nConsts;
+    naRef consts;
 };
 
 void naParseError(struct Parser* p, char* msg, int line);

diff --git a/simgear/nasal/string.c b/simgear/nasal/string.c
index 8d781c7ee9c24c101fc95c157948df89edbfb578..5efb153e389518786a58139e4b0c197663067919 100644 (file)
--- a/simgear/nasal/string.c
+++ b/simgear/nasal/string.c
@@ -151,11 +151,14 @@ static int readdec(unsigned char* s, int len, int i, double* v)
 // are returned as zero.
 static int readsigned(unsigned char* s, int len, int i, double* v)
 {
+    int i0 = i, i2;
     double sgn=1, val;
     if(i >= len) { *v = 0; return len; }
     if(s[i] == '+')      { i++; }
     else if(s[i] == '-') { i++; sgn = -1; }
-    i = readdec(s, len, i, &val);
+    i2 = readdec(s, len, i, &val);
+    if(i2 == i)
+        return i0; // don't parse "+" or "-" as zero.
     *v = sgn*val;
     return i;
 }