FIX: register logical operations in the parser

Kobzol · Oct 11, 2019 · 6d333e4 · 6d333e4
1 parent 2813b91
commit 6d333e4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/src/app/assembly/asm-parser.peg b/src/app/assembly/asm-parser.peg
@@ -75,7 +75,7 @@ MemoryInstruction =
 
 ArithmeticInstruction =
 	(
-	    name:$("ADD"i / "SUB"i / "ADC"i / "SBB"i) _ target:WritableExpression "," _ source:ReadableExpression
+	    name:$("ADD"i / "SUB"i / "ADC"i / "SBB"i / "AND"i / "OR"i / "XOR"i) _ target:WritableExpression "," _ source:ReadableExpression
         { return { tag: "Instruction", type: "Arithmetic", name: name, operands: [target, source] }; }
     ) /
     (

diff --git a/webpack.config.js b/webpack.config.js
@@ -78,13 +78,13 @@ module.exports = {
   },
   "entry": {
     "main": [
-      "./src\\main.ts"
+      "./src/main.ts"
     ],
     "polyfills": [
-      "./src\\polyfills.ts"
+      "./src/polyfills.ts"
     ],
     "styles": [
-      "./src\\styles.less"
+      "./src/styles.less"
     ]
   },
   "output": {
@@ -121,7 +121,7 @@ module.exports = {
       },
       {
         "exclude": [
-          path.join(process.cwd(), "src\\styles.less")
+          path.join(process.cwd(), "src/styles.less")
         ],
         "test": /\.css$/,
         "use": [
@@ -144,7 +144,7 @@ module.exports = {
       },
       {
         "exclude": [
-          path.join(process.cwd(), "src\\styles.less")
+          path.join(process.cwd(), "src/styles.less")
         ],
         "test": /\.scss$|\.sass$/,
         "use": [
@@ -175,7 +175,7 @@ module.exports = {
       },
       {
         "exclude": [
-          path.join(process.cwd(), "src\\styles.less")
+          path.join(process.cwd(), "src/styles.less")
         ],
         "test": /\.less$/,
         "use": [
@@ -204,7 +204,7 @@ module.exports = {
       },
       {
         "exclude": [
-          path.join(process.cwd(), "src\\styles.less")
+          path.join(process.cwd(), "src/styles.less")
         ],
         "test": /\.styl$/,
         "use": [
@@ -234,7 +234,7 @@ module.exports = {
       },
       {
         "include": [
-          path.join(process.cwd(), "src\\styles.less")
+          path.join(process.cwd(), "src/styles.less")
         ],
         "test": /\.css$/,
         "use": [
@@ -257,7 +257,7 @@ module.exports = {
       },
       {
         "include": [
-          path.join(process.cwd(), "src\\styles.less")
+          path.join(process.cwd(), "src/styles.less")
         ],
         "test": /\.scss$|\.sass$/,
         "use": [
@@ -288,7 +288,7 @@ module.exports = {
       },
       {
         "include": [
-          path.join(process.cwd(), "src\\styles.less")
+          path.join(process.cwd(), "src/styles.less")
         ],
         "test": /\.less$/,
         "use": [
@@ -317,7 +317,7 @@ module.exports = {
       },
       {
         "include": [
-          path.join(process.cwd(), "src\\styles.less")
+          path.join(process.cwd(), "src/styles.less")
         ],
         "test": /\.styl$/,
         "use": [
@@ -376,7 +376,7 @@ module.exports = {
       "sourceRoot": "webpack:///"
     }),
     new HtmlWebpackPlugin({
-      "template": "./src\\index.html",
+      "template": "./src/index.html",
       "filename": "./index.html",
       "hash": false,
       "inject": true,
@@ -432,10 +432,10 @@ module.exports = {
     new AotPlugin({
       "mainPath": "main.ts",
       "hostReplacementPaths": {
-        "environments\\environment.ts": "environments\\environment.ts"
+        "environments/environment.ts": "environments/environment.ts"
       },
       "exclude": [],
-      "tsConfigPath": "src\\tsconfig.app.json",
+      "tsConfigPath": "src/tsconfig.app.json",
       "skipCodeGeneration": true
     }),
       new webpack.DefinePlugin({