Merge PR #32: The #= on Symbol and String should be symmetric

smarr · Jan 13, 2023 · b0c8a2a · b0c8a2a · rebenchdb · Jan 23, 2023
2 parents 7737658 + 8a451d6
commit b0c8a2a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/core-lib b/core-lib
diff --git a/src/som/primitives/SymbolPrimitives.java b/src/som/primitives/SymbolPrimitives.java
@@ -29,6 +29,7 @@
 import som.vm.Universe;
 import som.vmobjects.SAbstractObject;
 import som.vmobjects.SPrimitive;
+import som.vmobjects.SString;
 import som.vmobjects.SSymbol;
 
 
@@ -57,9 +58,17 @@ public void invoke(final Frame frame, final Interpreter interpreter) {
         SSymbol op2 = (SSymbol) frame.pop(); // self
         if (op1 == op2) {
           frame.push(universe.trueObject);
-        } else {
-          frame.push(universe.falseObject);
+          return;
         }
+
+        if (op1 instanceof SString) {
+          SString s = (SString) op1;
+          if (s.getEmbeddedString().equals(op2.getEmbeddedString())) {
+            frame.push(universe.trueObject);
+            return;
+          }
+        }
+        frame.push(universe.falseObject);
       }
     }, true);
   }
+10 −10		.github/workflows/ci.yml
+5 −5		Examples/Benchmarks/TestSuite/Symbol2Test.som
+5 −5		Examples/Benchmarks/TestSuite/Symbol3Test.som
+5 −5		Examples/Benchmarks/TestSuite/Symbol4Test.som
+5 −5		Examples/Benchmarks/TestSuite/Symbol5Test.som
+5 −5		Examples/Benchmarks/TestSuite/SymbolTest.som
+4 −2		Smalltalk/Symbol.som
+0 −8		SomSom/src/primitives/SymbolPrimitives.som
+6 −1		TestSuite/SymbolTest.som