[PDP8] Refactor PDP-8 OperatorParser

tgtakaoka · Sep 30, 2024 · 767eab7 · 767eab7
1 parent d01b0d6
commit 767eab7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 37 deletions.
diff --git a/src/asm_pdp8.cpp b/src/asm_pdp8.cpp
@@ -106,6 +106,24 @@ struct Pdp8CommentParser final : CommentParser {
     };
 };
 
+struct Pdp8OperatorParser final : OperatorParser {
+    const Operator *readOperator(
+            StrScanner &scan, ErrorAt &error, Operator::Type type) const override {
+        UNUSED(error);
+        if (type == Operator::INFIX && scan.expect('!')) {
+            static const Operator OP_LOGICAL_OR(15, Operator::LEFT, 2, bitwise_or);
+            return &OP_LOGICAL_OR;
+        }
+        return CStyleOperatorParser::singleton().readOperator(scan, error, type);
+    }
+    static Error bitwise_or(ValueStack &stack) {
+        const auto rhs = stack.pop();
+        const auto lhs = stack.pop();
+        stack.push(lhs | rhs);
+        return OK;
+    }
+};
+
 }  // namespace
 
 const ValueParser::Plugins &AsmPdp8::defaultPlugins() {
@@ -114,11 +132,12 @@ const ValueParser::Plugins &AsmPdp8::defaultPlugins() {
         const SymbolParser &symbol() const override { return _symbol; }
         const LetterParser &letter() const override { return _letter; }
         const CommentParser &comment() const override { return _comment; }
-        const OperatorParser &operators() const override { return DecOperatorParser::singleton(); }
+        const OperatorParser &operators() const override { return _operators; }
         const LocationParser &location() const override { return _location; }
         const Pdp8SymbolParser _symbol{};
         const Pdp8LetterParser _letter{};
         const Pdp8CommentParser _comment{};
+        const Pdp8OperatorParser _operators{};
         const SimpleLocationParser _location{PSTR_DOT_DOLLAR};
     } PLUGINS{};
     return PLUGINS;

diff --git a/src/operators.cpp b/src/operators.cpp
@@ -537,37 +537,6 @@ const Operator *ZilogOperatorParser::readOperator(
     return CStyleOperatorParser::singleton().readOperator(scan, error, type);
 }
 
-const Operator *DecOperatorParser::readOperator(
-        StrScanner &scan, ErrorAt &error, Operator::Type type) const {
-    UNUSED(error);
-    auto p = scan;
-    const Operator *opr = nullptr;
-    if (type == Operator::PREFIX) {
-        if (p.expect('~')) {
-            opr = &OP_BITWISE_NOT;
-        } else if (p.expect('-')) {
-            opr = &OP_UNARY_MINUS;
-        } else if (p.expect('+')) {
-            opr = &OP_UNARY_PLUS;
-        }
-    } else if (type == Operator::INFIX) {
-        if (p.expect('+')) {
-            opr = &OP_ADD;
-        } else if (p.expect('-')) {
-            opr = &OP_SUB;
-        } else if (p.expect('&')) {
-            opr = &OP_BITWISE_AND;
-        } else if (p.expect('^')) {
-            opr = &OP_BITWISE_XOR;
-        } else if (p.expect('!')) {
-            opr = &OP_BITWISE_OR;
-        }
-    }
-    if (opr)
-        scan = p;
-    return opr;
-}
-
 }  // namespace libasm
 
 // Local Variables:

diff --git a/src/operators.h b/src/operators.h
@@ -139,11 +139,6 @@ struct ZilogOperatorParser final : OperatorParser, Singleton<ZilogOperatorParser
             StrScanner &scan, ErrorAt &error, Operator::Type type) const override;
 };
 
-struct DecOperatorParser final : OperatorParser, Singleton<DecOperatorParser> {
-    const Operator *readOperator(
-            StrScanner &scan, ErrorAt &error, Operator::Type type) const override;
-};
-
 }  // namespace libasm
 
 #endif