@sdeverywhere/compile 0.7.11 → 0.7.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdeverywhere/compile",
-  "version": "0.7.11",
+  "version": "0.7.13",
   "description": "The core Vensim to C compiler for the SDEverywhere tool suite.",
   "type": "module",
   "main": "./src/index.js",

package/src/_shared/helpers.js

@@ -375,7 +375,3 @@ export let vlog = (title, value, depth = 1) => {
     console.trace()
   }
 }
-export let abend = error => {
-  console.error(error)
-  process.exit(1)
-}

package/src/_shared/read-dat.js

@@ -35,8 +35,16 @@ export async function readDat(pathname, prefix = '') {
     }
   }
 
-  return new Promise(resolve => {
-    let stream = byline(fs.createReadStream(pathname, 'utf8'))
+  return new Promise((resolve, reject) => {
+    // Errors from the read stream aren't propagated by the byline package
+    // so we attach the error handler to `readStream` rather than to `stream`
+    let readStream = fs.createReadStream(pathname, 'utf8')
+    let stream = byline(readStream)
+    readStream.on('error', e => {
+      stream.destroy()
+      reject(new Error(`Failed to read dat file: ${e.message}`))
+    })
+
     stream.on('data', line => {
       let values = splitDatLine(line)
       if (values.length === 1) {
@@ -63,6 +71,7 @@ export async function readDat(pathname, prefix = '') {
       lineNum++
       // if (lineNum % 1e5 === 0) console.log(num(lineNum).format('0,0'))
     })
+
     stream.on('end', () => {
       addValues()
       resolve(log)

package/src/generate/code-gen.js

@@ -1,6 +1,6 @@
 import * as R from 'ramda'
 
-import { asort, lines, strlist, abend, mapIndexed } from '../_shared/helpers.js'
+import { asort, lines, strlist, mapIndexed } from '../_shared/helpers.js'
 import { sub, allDimensions, allMappings, subscriptFamilies } from '../_shared/subscript.js'
 import Model from '../model/model.js'
 
@@ -37,30 +37,26 @@ let codeGenerator = (parsedModel, opts) => {
   function generate() {
     // Read variables and subscript ranges from the model parse tree.
     // This is the main entry point for code generation and is called just once.
-    try {
-      Model.read(parsedModel, spec, extData, directData, modelDirname)
-      // In list mode, print variables to the console instead of generating code.
-      if (operations.includes('printRefIdTest')) {
-        Model.printRefIdTest()
-      }
-      if (operations.includes('printRefGraph')) {
-        Model.printRefGraph(opts.varname)
-      }
-      if (operations.includes('convertNames')) {
-        // Do not generate output, but leave the results of model analysis.
-      }
-      if (operations.includes('generateC')) {
-        // Generate code for each variable in the proper order.
-        let code = emitDeclCode()
-        code += emitInitLookupsCode()
-        code += emitInitConstantsCode()
-        code += emitInitLevelsCode()
-        code += emitEvalCode()
-        code += emitIOCode()
-        return code
-      }
-    } catch (e) {
-      abend(e)
+    Model.read(parsedModel, spec, extData, directData, modelDirname)
+    // In list mode, print variables to the console instead of generating code.
+    if (operations.includes('printRefIdTest')) {
+      Model.printRefIdTest()
+    }
+    if (operations.includes('printRefGraph')) {
+      Model.printRefGraph(opts.varname)
+    }
+    if (operations.includes('convertNames')) {
+      // Do not generate output, but leave the results of model analysis.
+    }
+    if (operations.includes('generateC')) {
+      // Generate code for each variable in the proper order.
+      let code = emitDeclCode()
+      code += emitInitLookupsCode()
+      code += emitInitConstantsCode()
+      code += emitInitLevelsCode()
+      code += emitEvalCode()
+      code += emitIOCode()
+      return code
     }
   }
 

package/src/model/model.js

@@ -395,14 +395,12 @@ function removeUnusedVariables(spec) {
   // ensures that we include all subscripts for a variable, which might mean we
   // include some subscripts that aren't needed, but it is safer than trying to
   // eliminate those and possibly omit something that is needed.
-  const referencedVarNames = []
+  const referencedVarNames = new Set()
 
   // Add the given variable name to the list of referenced variables, if it's not
   // already there.
   const recordUsedVarName = varName => {
-    if (!referencedVarNames.includes(varName)) {
-      referencedVarNames.push(varName)
-    }
+    referencedVarNames.add(varName)
   }
 
   // Add the given variable to the list of referenced variables, and do the same for
@@ -443,20 +441,23 @@ function removeUnusedVariables(spec) {
     // that are referenced by this variable, either directly (`v.references`) or
     // in an "INITIAL" expression (`v.initReferences`).  It's OK if we end up with
     // duplicates in this list, because we will examine each reference only once.
-    let refIds = refIdsWithName(v.varName)
-    refIds = refIds.concat(v.references)
-    refIds = refIds.concat(v.initReferences)
-    for (const refId of refIds) {
+    let refStack = []
+    function pushRefs(v) {
+      refStack.push(...refIdsWithName(v.varName))
+      refStack.push(...v.references)
+      refStack.push(...v.initReferences)
+    }
+    pushRefs(v)
+    while (refStack.length > 0) {
+      const refId = refStack.pop()
       if (!referencedRefIds.has(refId)) {
         referencedRefIds.add(refId)
         const refVar = varWithRefId(refId)
         if (refVar) {
           recordUsedVariable(refVar)
-          recordRefsOfVariable(refVar)
+          pushRefs(refVar)
         } else {
-          console.error(`No var found for ${refId}`)
-          console.error(v)
-          process.exit(1)
+          throw new Error(`No var found for ${refId} when recording references for ${v.varName}`)
         }
       }
     }
@@ -470,7 +471,11 @@ function removeUnusedVariables(spec) {
 
   // Keep all input variables
   for (const inputVarName of spec.inputVars) {
-    for (const v of varsWithName(inputVarName)) {
+    // The inputVars can include a raw index, e.g. `_input_var[0]`,
+    // which isn't an actual "ref id", so we'll just derive the
+    // var name by chopping off the index part.
+    const inputVarBaseName = inputVarName.split('[')[0]
+    for (const v of varsWithName(inputVarBaseName)) {
       recordUsedVariable(v)
     }
   }
@@ -488,7 +493,7 @@ function removeUnusedVariables(spec) {
   }
 
   // Filter out unneeded variables so we're left with the minimal set of variables to emit
-  variables = R.filter(v => referencedVarNames.includes(v.varName), variables)
+  variables = R.filter(v => referencedVarNames.has(v.varName), variables)
 
   // Rebuild the variables-by-name map
   variablesByName.clear()
@@ -877,13 +882,7 @@ function sortVarsOfType(varType) {
   // Sort into an lhs dependency list.
   if (PRINT_AUX_GRAPH) printDepsGraph(graph, 'AUX')
   if (PRINT_LEVEL_GRAPH) printDepsGraph(graph, 'LEVEL')
-  let deps
-  try {
-    deps = toposort(graph).reverse()
-  } catch (e) {
-    console.error(e.message)
-    process.exit(1)
-  }
+  let deps = toposort(graph).reverse()
 
   // Turn the dependency-sorted var name list into a var list.
   let sortedVars = varsOfType(
@@ -978,13 +977,7 @@ function sortInitVars() {
   if (PRINT_INIT_GRAPH) printDepsGraph(graph, 'INIT')
 
   // Sort into a reference id dependency list.
-  let deps
-  try {
-    deps = toposort(graph).reverse()
-  } catch (e) {
-    console.error(e.message)
-    process.exit(1)
-  }
+  let deps = toposort(graph).reverse()
 
   // Turn the reference id list into a var list.
   let sortedVars = R.map(refId => varWithRefId(refId), deps)

package/src/model/toposort.js

@@ -42,7 +42,7 @@ function toposort(nodes, edges) {
       } catch (e) {
         nodeRep = ''
       }
-      throw new Error('toposort cyclic dependency:\n' + [...predecessors].join(' →\n') + nodeRep)
+      throw new Error('Found cyclic dependency during toposort:\n' + [...predecessors].join(' →\n') + nodeRep)
     }
 
     if (!nodesHash.has(node)) {