@sdeverywhere/compile 0.7.8 → 0.7.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdeverywhere/compile",
-  "version": "0.7.8",
+  "version": "0.7.9",
   "description": "The core Vensim to C compiler for the SDEverywhere tool suite.",
   "type": "module",
   "files": [
@@ -9,8 +9,8 @@
   ],
   "main": "./src/index.js",
   "dependencies": {
-    "antlr4": "4.9.2",
-    "antlr4-vensim": "0.6.0",
+    "antlr4": "4.12.0",
+    "antlr4-vensim": "0.6.2",
     "bufx": "^1.0.5",
     "byline": "^5.0.0",
     "csv-parse": "^5.3.3",

package/src/generate/equation-gen.js

@@ -983,8 +983,9 @@ export default class EquationGen extends ModelReader {
     // Push the var name on the stack and then emit it.
     let id = ctx.Id().getText()
     let varName = canonicalName(id)
+    let functionName = this.currentFunctionName()
     if (isDimension(varName)) {
-      if (this.currentFunctionName() === '_ELMCOUNT') {
+      if (functionName === '_ELMCOUNT') {
         // Emit the size of the dimension in place of the dimension name.
         this.emit(`${sub(varName).size}`)
       } else {
@@ -997,8 +998,8 @@ export default class EquationGen extends ModelReader {
       }
     } else {
       this.varNames.push(varName)
-      if (this.currentFunctionName() === '_VECTOR_SELECT') {
-        let argIndex = this.argIndexForFunctionName('_VECTOR_SELECT')
+      if (functionName === '_VECTOR_SELECT') {
+        let argIndex = this.argIndexForFunctionName(functionName)
         if (argIndex === 0) {
           this.vsSelectionArray = this.currentVarName()
           super.visitVar(ctx)
@@ -1007,30 +1008,42 @@ export default class EquationGen extends ModelReader {
         } else {
           super.visitVar(ctx)
         }
-      } else if (this.currentFunctionName() === '_VECTOR_ELM_MAP') {
-        if (this.argIndexForFunctionName('_VECTOR_ELM_MAP') === 1) {
+      } else if (functionName === '_VECTOR_ELM_MAP') {
+        if (this.argIndexForFunctionName(functionName) === 1) {
           this.vemOffset = this.currentVarName()
         }
         super.visitVar(ctx)
-      } else if (this.currentFunctionName() === '_VECTOR_SORT_ORDER') {
-        if (this.argIndexForFunctionName('_VECTOR_SORT_ORDER') === 0) {
+      } else if (functionName === '_VECTOR_SORT_ORDER') {
+        if (this.argIndexForFunctionName(functionName) === 0) {
           this.vsoVarName = this.currentVarName()
           this.vsoTmpName = newTmpVarName()
           this.emit(this.vsoTmpName)
         }
         super.visitVar(ctx)
-      } else if (this.currentFunctionName() === '_ALLOCATE_AVAILABLE') {
-        if (this.argIndexForFunctionName('_ALLOCATE_AVAILABLE') === 0) {
+      } else if (functionName === '_ALLOCATE_AVAILABLE') {
+        if (this.argIndexForFunctionName(functionName) === 0) {
           this.aaRequestArray = this.currentVarName()
           this.aaTmpName = newTmpVarName()
           this.emit(this.aaTmpName)
-        } else if (this.argIndexForFunctionName('_ALLOCATE_AVAILABLE') === 1) {
+        } else if (this.argIndexForFunctionName(functionName) === 1) {
           this.aaPriorityArray = this.currentVarName()
         }
         super.visitVar(ctx)
-      } else if (this.currentFunctionName() === '_GET_DATA_BETWEEN_TIMES') {
+      } else if (functionName === '_GET_DATA_BETWEEN_TIMES') {
         this.emit(this.currentVarName())
         super.visitVar(ctx)
+      } else if (
+        functionName === '_LOOKUP_FORWARD' ||
+        functionName === '_LOOKUP_BACKWARD' ||
+        functionName === '_LOOKUP_INVERT'
+      ) {
+        let argIndex = this.argIndexForFunctionName(functionName)
+        if (argIndex === 0) {
+          this.emit(this.currentVarName())
+          super.visitVar(ctx)
+        } else {
+          emitVar()
+        }
       } else {
         emitVar()
       }

package/src/model/subscript-range-reader.js

@@ -48,13 +48,29 @@ export default class SubscriptRangeReader extends ModelReader {
     }
   }
   visitSubscriptList(ctx) {
-    // A subscript list can appear in either a subscript range or mapping.
-    let subscripts = R.map(id => id.getText(), ctx.Id())
-    if (ctx.parentCtx.ruleIndex === ModelParser.RULE_subscriptRange) {
-      this.indNames = subscripts
+    // Get the subscripts from each subscript index in the list.
+    for (let child of ctx.children) {
+      if (child.symbol?.type === ModelParser.Id) {
+        this.addSubscriptIndex(ctx, child)
+      }
     }
-    if (ctx.parentCtx.ruleIndex === ModelParser.RULE_subscriptMapping) {
-      this.mappingValue = subscripts
+  }
+  visitSubscriptDefList(ctx) {
+    // Subscript range definitions can have indices and numeric subscript sequences.
+    for (let child of ctx.children) {
+      if (child.symbol?.type === ModelParser.Id) {
+        this.addSubscriptIndex(ctx, child)
+      } else if (child.ruleIndex === ModelParser.RULE_subscriptSequence) {
+        this.visitSubscriptSequence(child)
+      }
+    }
+  }
+  addSubscriptIndex(ctx, child) {
+    let subscript = child.getText()
+    if (ctx.parentCtx.ruleIndex === ModelParser.RULE_subscriptRange) {
+      this.indNames.push(subscript)
+    } else if (ctx.parentCtx.ruleIndex === ModelParser.RULE_subscriptMapping) {
+      this.mappingValue.push(subscript)
     }
   }
   visitSubscriptMapping(ctx) {
@@ -74,6 +90,7 @@ export default class SubscriptRangeReader extends ModelReader {
       let prefix = matches[0][1]
       let start = parseInt(matches[0][2])
       let end = parseInt(matches[1][2])
+      // TODO get this to work with subscript mappings too
       for (let i = start; i <= end; i++) {
         this.indNames.push(prefix + i)
       }