Merge PR #12: Fix parsing of #- symbol

Author: smarr

.github/workflows/ci.yml

@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      
+      - uses: actions/checkout@v3
+
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
 
       - run: ./som.sh -cp core-lib/Smalltalk core-lib/TestSuite/TestHarness.som
       - run: ./som.sh -cp core-lib/Smalltalk:core-lib/TestSuite:core-lib/SomSom/src/compiler:core-lib/SomSom/src/vm:core-lib/SomSom/src/vmobjects:core-lib/SomSom/src/interpreter:core-lib/SomSom/src/primitives core-lib/SomSom/tests/SomSomTests.som

core-lib

@@ -18,7 +18,7 @@ runs:
 benchmark_suites:
     macro:
         gauge_adapter: RebenchLog
-        command: &MACRO_CMD "-cp Smalltalk:Examples/Benchmarks/Richards:Examples/Benchmarks/DeltaBlue:Examples/Benchmarks/NBody:Examples/Benchmarks/Json:Examples/Benchmarks/GraphSearch Examples/Benchmarks/BenchmarkHarness.som %(benchmark)s %(iterations)s 0 "
+        command: &MACRO_CMD "-cp Smalltalk:Examples/Benchmarks/Richards:Examples/Benchmarks/DeltaBlue:Examples/Benchmarks/NBody:Examples/Benchmarks/Json:Examples/Benchmarks/GraphSearch Examples/Benchmarks/BenchmarkHarness.som %(benchmark)s %(iterations)s "
         iterations: 10
         benchmarks:
             - Richards:     {extra_args: 1}
@@ -30,7 +30,7 @@ benchmark_suites:
 
     micro:
         gauge_adapter: RebenchLog
-        command: "-cp Smalltalk:Examples/Benchmarks/LanguageFeatures Examples/Benchmarks/BenchmarkHarness.som %(benchmark)s %(iterations)s 0 "
+        command: "-cp Smalltalk:Examples/Benchmarks/LanguageFeatures Examples/Benchmarks/BenchmarkHarness.som %(benchmark)s %(iterations)s "
         iterations: 10
         benchmarks:
             - Fannkuch:     {extra_args: 6}
@@ -56,7 +56,7 @@ benchmark_suites:
 
 executors:
     som:  {path: ., executable: som.sh}
-        
+
 # define the benchmarks to be executed for a re-executable benchmark run
 experiments:
     JsSOM:

rebench.conf

@@ -96,7 +96,7 @@ class ParseErrorWithSymbolList extends ParseError {
 
 const singleOpSyms = [Sym.Not, Sym.And, Sym.Or, Sym.Star, Sym.Div,
   Sym.Mod, Sym.Plus, Sym.Equal, Sym.More, Sym.Less,
-  Sym.Comma, Sym.At, Sym.Per, Sym.NONE];
+  Sym.Comma, Sym.At, Sym.Per, Sym.Minus, Sym.NONE];
 
 const binaryOpSyms = [Sym.Or, Sym.Comma, Sym.Minus, Sym.Equal, Sym.Not,
   Sym.And, Sym.Or, Sym.Star, Sym.Div, Sym.Mod,
@@ -331,11 +331,7 @@ export class Parser {
   binarySelector() {
     const s = this.text;
 
-    if (this.accept(Sym.Or)) { /* noop */
-    } else if (this.accept(Sym.Comma)) { /* noop */
-    } else if (this.accept(Sym.Minus)) { /* noop */
-    } else if (this.accept(Sym.Equal)) { /* noop */
-    } else if (this.acceptOneOf(singleOpSyms)) { /* noop */
+    if (this.acceptOneOf(singleOpSyms)) { /* noop */
     } else if (this.accept(Sym.OperatorSequence)) { /* noop */
     } else { this.expect(Sym.NONE); }