get rid of JS.var in Code.ob

src/context.js

@@ -129,7 +129,7 @@ exports.Integer = ChainedContext.extend({
     toInt: function(s){return parseInt(this.__result, 10);},
     endParse: function(){
         var n = this.toInt();
-        this.parent().handleConst(basicTypes.integer, n, n.toString());
+        this.parent().handleConst(basicTypes.integer, Code.makeNumberConst(n), n.toString());
     }
 });
 
@@ -154,7 +154,7 @@ exports.Real = ChainedContext.extend({
     },
     endParse: function(){
         var n = Number(this.__result);
-        this.parent().handleConst(basicTypes.real, n, n.toString());
+        this.parent().handleConst(basicTypes.real, Code.makeNumberConst(n), n.toString());
     }
 });
 
@@ -185,7 +185,7 @@ exports.String = ChainedContext.extend({
     toStr: function(s){return s;},
     endParse: function(){
         var s = this.toStr(this.__result);
-        this.parent().handleConst(Type.makeString(s), s, escapeString(s));
+        this.parent().handleConst(Type.makeString(s), Code.makeStringConst(s), escapeString(s));
         }
 });
 
@@ -320,10 +320,10 @@ exports.Designator = ChainedContext.extend({
             throw new Errors.Error("ARRAY expected, got '" + type.description() + "'");
         var value = e.constValue();
         var arrayLen = Type.arrayLength(type);
-        if (value !== undefined && arrayLen != Type.openArrayLength && value >= arrayLen)
+        if (value !== undefined && arrayLen != Type.openArrayLength && value.value >= arrayLen)
             throw new Errors.Error("index out of bounds: maximum possible index is "
                                  + (Type.arrayLength(type) - 1)
-                                 + ", got " + value );
+                                 + ", got " + value.value );
 
         this.__currentType = Type.arrayElementsType(type);
         this.__info = Type.makeVariable(this.__currentType, Type.isVariableReadOnly(this.__info));
@@ -728,9 +728,9 @@ exports.ArrayDimensions = ChainedContext.extend({
         var value = e.constValue();
         if (value === undefined)
             throw new Errors.Error("constant expression expected as ARRAY size");
-        if (value <= 0)
-            throw new Errors.Error("array size must be greater than 0, got " + value);
-        this.__dimensions.push(value);
+        if (value.value <= 0)
+            throw new Errors.Error("array size must be greater than 0, got " + value.value);
+        this.__dimensions.push(value.value);
     },
     endParse: function(){
         this.parent().handleDimensions(this.__dimensions);
@@ -970,9 +970,9 @@ exports.Factor = ChainedContext.extend({
         if (s == "NIL")
             parent.handleConst(nilType, undefined, "null");
         else if (s == "TRUE")
-            parent.handleConst(basicTypes.bool, true, "true");
+            parent.handleConst(basicTypes.bool, Code.makeNumberConst(true), "true");
         else if (s == "FALSE")
-            parent.handleConst(basicTypes.bool, false, "false");
+            parent.handleConst(basicTypes.bool, Code.makeNumberConst(false), "false");
         else if (s == "~")
             parent.handleLogicalNot();
     },
@@ -989,10 +989,10 @@ exports.Set = ChainedContext.extend({
     handleElement: function(from, fromValue, to, toValue){
         if (fromValue !== undefined && (!to || toValue !== undefined)){
             if (to)
-                for(var i = fromValue; i <= toValue; ++i)
+                for(var i = fromValue.value; i <= toValue.value; ++i)
                     this.__value |= 1 << i;
             else
-                this.__value |= 1 << fromValue;
+                this.__value |= 1 << fromValue.value;
         }
         else{
             if (this.__expr.length)
@@ -1006,7 +1006,7 @@ exports.Set = ChainedContext.extend({
     endParse: function(){
         var parent = this.parent();
         if (!this.__expr.length)
-            parent.handleConst(basicTypes.set, this.__value, this.__value.toString());
+            parent.handleConst(basicTypes.set, Code.makeNumberConst(this.__value), this.__value.toString());
         else{
             var code = this.rtl().makeSet(this.__expr);
             if (this.__value)
@@ -1272,8 +1272,8 @@ exports.CaseLabelList = ChainedContext.extend({
             this.parent().caseLabelBegin();
 
         var cond = to === undefined
-            ? "$c === " + from
-            : "($c >= " + from + " && $c <= " + to + ")";
+            ? "$c === " + from.value
+            : "($c >= " + from.value + " && $c <= " + to.value + ")";
         this.codeGenerator().write(this.__glue + cond);
         this.__glue = " || ";
     },
@@ -1317,6 +1317,7 @@ exports.CaseRange = ChainedContext.extend({
             if (!Type.stringAsChar(type, {set: function(v){value = v;}}))
                 throw new Errors.Error("single-character string expected");
             type = basicTypes.ch;
+            value = Code.makeNumberConst(value);
         }
         this.handleLabel(type, value);
     },
@@ -1416,7 +1417,7 @@ exports.For = ChainedContext.extend({
         else if ( value === undefined )
             throw new Errors.Error("constant expression expected as 'BY' parameter");
         else
-            this.__by = value;
+            this.__by = value.value;
     },
     codeGenerator: function(){
         if (this.__initExprParsed && !this.__toParsed)

src/js/Code.js

@@ -40,12 +40,28 @@ var Designator = RTL$.extend({
 		this.mScope = null;
 	}
 });
+var Const = RTL$.extend({
+	init: function Const(){
+	}
+});
+var NumberConst = Const.extend({
+	init: function NumberConst(){
+		Const.prototype.init.call(this);
+		this.value = 0;
+	}
+});
+var StringConst = Const.extend({
+	init: function StringConst(){
+		Const.prototype.init.call(this);
+		this.value = null;
+	}
+});
 var Expression = RTL$.extend({
 	init: function Expression(){
 		this.mCode = null;
 		this.mType = null;
 		this.mDesignator = null;
-		this.mConstValue = undefined;
+		this.mConstValue = null;
 		this.mMaxPrecedence = 0;
 	}
 });
@@ -62,7 +78,6 @@ var Closure = Object.Type.extend({
 	}
 });
 var nullGenerator = new NullGenerator();
-var undefined = undefined;
 NullGenerator.prototype.write = function(s/*Type*/){
 }
 NullGenerator.prototype.openScope = function(){
@@ -148,7 +163,21 @@ Expression.prototype.isTerm = function(){
 	return this.mDesignator == null && this.mMaxPrecedence == kNoPrecedence;
 }
 
-function makeExpressionWithPrecedence(code/*Type*/, type/*PType*/, designator/*PDesigantor*/, constValue/*JS.var*/, maxPrecedence/*INTEGER*/){
+function makeNumberConst(n/*REAL*/){
+	var result = null;
+	result = new NumberConst();
+	result.value = n;
+	return result;
+}
+
+function makeStringConst(s/*Type*/){
+	var result = null;
+	result = new StringConst();
+	result.value = s;
+	return result;
+}
+
+function makeExpressionWithPrecedence(code/*Type*/, type/*PType*/, designator/*PDesigantor*/, constValue/*PConst*/, maxPrecedence/*INTEGER*/){
 	var result = null;
 	result = new Expression();
 	result.mCode = code;
@@ -159,12 +188,12 @@ function makeExpressionWithPrecedence(code/*Type*/, type/*PType*/, designator/*P
 	return result;
 }
 
-function makeExpression(code/*Type*/, type/*PType*/, designator/*PDesigantor*/, constValue/*JS.var*/){
+function makeExpression(code/*Type*/, type/*PType*/, designator/*PDesigantor*/, constValue/*PConst*/){
 	return makeExpressionWithPrecedence(code, type, designator, constValue, kNoPrecedence);
 }
 
 function makeSimpleExpression(code/*Type*/, type/*PType*/){
-	return makeExpression(code, type, null, undefined);
+	return makeExpression(code, type, null, null);
 }
 Designator.prototype.code = function(){
 	return this.mCode;
@@ -203,7 +232,7 @@ function derefExpression(e/*PExpression*/){
 		result = e;
 	}
 	else {
-		result = makeExpression(JsString.concat(e.mCode, JsString.make(".get()")), e.mType, null, undefined);
+		result = makeSimpleExpression(JsString.concat(e.mCode, JsString.make(".get()")), e.mType);
 	}
 	return result;
 }
@@ -214,7 +243,7 @@ function refExpression(e/*PExpression*/){
 		result = e;
 	}
 	else {
-		result = makeExpression(e.mDesignator.mRefCode(e.mDesignator.mCode), e.mType, null, undefined);
+		result = makeSimpleExpression(e.mDesignator.mRefCode(e.mDesignator.mCode), e.mType);
 	}
 	return result;
 }
@@ -329,6 +358,8 @@ function makeModuleGenerator(name/*Type*/, imports/*Strings*/){
 }
 exports.Expression = Expression;
 exports.nullGenerator = function(){return nullGenerator;};
+exports.makeNumberConst = makeNumberConst;
+exports.makeStringConst = makeStringConst;
 exports.makeExpressionWithPrecedence = makeExpressionWithPrecedence;
 exports.makeExpression = makeExpression;
 exports.makeSimpleExpression = makeSimpleExpression;

src/ob/Code.ob

@@ -1,5 +1,5 @@
 MODULE Code;
-IMPORT JS, JsMap, JsString, Context, Object, Stream, Symbols, Types;
+IMPORT JsMap, JsString, Context, Object, Stream, Symbols, Types;
 
 CONST
     kTab = 09X;
@@ -46,24 +46,36 @@ TYPE
 
     PDesigantor = POINTER TO Designator;
 
-    PExpression* = POINTER TO Expression;
+    Const = RECORD
+    END;
+    PConst = POINTER TO Const;
+
+    NumberConst = RECORD (Const)
+        value: REAL
+    END;
+
+    StringConst = RECORD (Const)
+        value: JsString.Type
+    END;
 
     Expression* = RECORD
         PROCEDURE code(): JsString.Type;
         PROCEDURE lval(): JsString.Type;
         PROCEDURE type(): Types.PType;
         PROCEDURE designator(): PDesigantor;
-        PROCEDURE constValue(): JS.var;
+        PROCEDURE constValue(): PConst;
         PROCEDURE maxPrecedence(): INTEGER;
         PROCEDURE isTerm(): BOOLEAN;
 
         mCode: JsString.Type;
         mType: Types.PType;
         mDesignator: PDesigantor;
-        mConstValue: JS.var;
+        mConstValue: PConst;
         mMaxPrecedence: INTEGER
     END;
 
+    PExpression* = POINTER TO Expression;
+
     ModuleGenerator = RECORD
         PROCEDURE prolog(): JsString.Type;
         PROCEDURE epilog(exports: JsMap.Type): JsString.Type;
@@ -80,7 +92,6 @@ TYPE
 
 VAR
     nullGenerator*: NullGenerator;
-    undefined: JS.var;
 
 PROCEDURE NullGenerator.write(s: JsString.Type);
 END NullGenerator.write;
@@ -176,7 +187,7 @@ PROCEDURE Expression.designator(): PDesigantor;
     RETURN SELF.mDesignator
 END Expression.designator;
 
-PROCEDURE Expression.constValue(): JS.var;
+PROCEDURE Expression.constValue(): PConst;
     RETURN SELF.mConstValue
 END Expression.constValue;
 
@@ -188,11 +199,29 @@ PROCEDURE Expression.isTerm(): BOOLEAN;
     RETURN (SELF.mDesignator = NIL) & (SELF.mMaxPrecedence = kNoPrecedence)
 END Expression.isTerm;
 
+PROCEDURE makeNumberConst*(n: REAL): PConst;
+VAR
+    result: POINTER TO NumberConst;
+BEGIN
+    NEW(result);
+    result.value := n;
+    RETURN result
+END makeNumberConst;
+
+PROCEDURE makeStringConst*(s: JsString.Type): PConst;
+VAR
+    result: POINTER TO StringConst;
+BEGIN
+    NEW(result);
+    result.value := s;
+    RETURN result
+END makeStringConst;
+
 PROCEDURE makeExpressionWithPrecedence*(
     code: JsString.Type; 
     type: Types.PType; 
     designator: PDesigantor; 
-    constValue: JS.var; 
+    constValue: PConst; 
     maxPrecedence: INTEGER): PExpression;
 VAR
     result: PExpression;
@@ -210,7 +239,7 @@ PROCEDURE makeExpression*(
     code: JsString.Type; 
     type: Types.PType; 
     designator: PDesigantor; 
-    constValue: JS.var)
+    constValue: PConst)
     : PExpression;
     RETURN makeExpressionWithPrecedence(code, type, designator, constValue, kNoPrecedence)
 END makeExpression;
@@ -219,7 +248,7 @@ PROCEDURE makeSimpleExpression*(
     code: JsString.Type; 
     type: Types.PType)
     : PExpression;
-    RETURN makeExpression(code, type, NIL, undefined)
+    RETURN makeExpression(code, type, NIL, NIL)
 END makeSimpleExpression;
 
 PROCEDURE Designator.code(): JsString.Type;
@@ -269,10 +298,8 @@ BEGIN
         OR ~(e.mDesignator.mInfo IS Types.PVariableRef) THEN
         result := e;
     ELSE
-        result := makeExpression(JsString.concat(e.mCode, JsString.make(".get()")),
-                                 e.mType,
-                                 NIL,
-                                 undefined);
+        result := makeSimpleExpression(JsString.concat(e.mCode, JsString.make(".get()")),
+                                       e.mType);
     END;
     RETURN result
 END derefExpression;
@@ -285,10 +312,8 @@ BEGIN
         OR (e.mDesignator.mInfo IS Types.PVariableRef) THEN
         result := e;
     ELSE
-        result := makeExpression(e.mDesignator.mRefCode(e.mDesignator.mCode),
-                                 e.mType,
-                                 NIL,
-                                 undefined);
+        result := makeSimpleExpression(e.mDesignator.mRefCode(e.mDesignator.mCode),
+                                       e.mType);
     END;
     RETURN result
 END refExpression;

src/operator.js

@@ -27,8 +27,8 @@ function makeBinary(op, code, precedence, resultPrecedence, resultType){
     return function(left, right, context){
         var leftValue = left.constValue();
         var rightValue = right.constValue();
-        var value = (leftValue !== undefined && rightValue !== undefined)
-            ? op(leftValue, rightValue) : undefined;
+        var value = (leftValue && rightValue)
+            ? Code.makeNumberConst(op(leftValue.value, rightValue.value)) : undefined;
 
         var leftCode = Code.adjustPrecedence(Code.derefExpression(left), precedence);
 
@@ -45,8 +45,8 @@ function makeUnary(op, code){
     return function(e){
         var type = e.type();
         var value = e.constValue();
-        if (value !== undefined)
-            value = op(value, type) ;
+        if (value)
+            value = Code.makeNumberConst(op(value.value, type));
         var expCode = code + Code.adjustPrecedence(Code.derefExpression(e), precedence.unary);
         return Code.makeExpression(expCode, type, undefined, value);
     };

src/procedure.js

@@ -197,13 +197,13 @@ function setBitImpl(name, bitOp){
     function operator(x, y){
         var value = y.constValue();
         var valueCode;
-        if (value === undefined)
+        if (!value)
             valueCode = op.lsl(Code.makeExpression("1"), y).code();
         else {
-            if (value < 0 || value > 31)
-                throw new Errors.Error("value (0..31) expected as a second argument of " + name + ", got " + value);
-            var comment = "bit: " + (y.isTerm() ? value : Code.adjustPrecedence(y, precedence.shift));
-            value = 1 << value;
+            if (value.value < 0 || value.value > 31)
+                throw new Errors.Error("value (0..31) expected as a second argument of " + name + ", got " + value.value);
+            var comment = "bit: " + (y.isTerm() ? value.value : Code.adjustPrecedence(y, precedence.shift));
+            value = 1 << value.value;
             valueCode = value + "/*" + comment + "*/";
         }
         return bitOp(Code.adjustPrecedence(x, precedence.assignment), valueCode);
@@ -233,7 +233,7 @@ function incImpl(name, unary, op){
             valueCode = y.code();
         else {
             var comment = y.isTerm() ? "" : "/*" + y.code() + "*/";
-            valueCode = value + comment;
+            valueCode = value.value + comment;
         }
         return op(x.code(), valueCode);
     }
@@ -489,7 +489,7 @@ exports.predefined = [
                     var code = Code.adjustPrecedence(e, precedence.conditional) + " ? 1 : 0";
                     var value = e.constValue();
                     if (value !== undefined)
-                        value = value ? 1 : 0;
+                        value = Code.makeNumberConst(value.value ? 1 : 0);
                     this.__callExpression = Code.makeExpressionWithPrecedence(
                         code, basicTypes.integer, undefined, value, precedence.conditional);
                 }