Operators

ParfenovIgor · Nov 27, 2024 · 50980e7 · 50980e7
1 parent e511ba8
commit 50980e7
Show file tree

Hide file tree

Showing 12 changed files with 671 additions and 171 deletions.
diff --git a/compiler/include/ast.h b/compiler/include/ast.h
@@ -20,7 +20,6 @@ enum NodeType {
     NodeAs,
     NodeAssignment,
     NodeMovement,
-    NodeAssumption,
     NodeIdentifier,
     NodeInteger,
     NodeChar,
@@ -33,12 +32,27 @@ enum NodeType {
     NodeDereference,
     NodeIndex,
     NodeGetField,
+
+    NodeAnd,
+    NodeOr,
+    NodeNot,
+    NodeBitwiseAnd,
+    NodeBitwiseOr,
+    NodeBitwiseXor,
+    NodeBitwiseNot,
+    NodeBitwiseLeft,
+    NodeBitwiseRight,
     NodeAddition,
     NodeSubtraction,
     NodeMultiplication,
     NodeDivision,
+    NodeModulo,
     NodeLess,
+    NodeGreater,
     NodeEqual,
+    NodeLessEqual,
+    NodeGreaterEqual,
+    NodeNotEqual,
 };
 
 struct Node;
@@ -72,12 +86,6 @@ struct FunctionCall;
 struct Dereference;
 struct Index;
 struct GetField;
-struct Addition;
-struct Subtraction;
-struct Multiplication;
-struct Division;
-struct Less;
-struct Equal;
 
 
 struct FunctionSignature {
@@ -164,17 +172,6 @@ struct As {
     struct TypeNode *type;
 };
 
-struct Index {
-    struct Node *left, *right;
-    bool address;
-};
-
-struct GetField {
-    struct Node *left;
-    const char *field;
-    bool address;
-};
-
 struct Assignment {
     struct Node *dst, *src;
 };
@@ -227,6 +224,17 @@ struct Dereference {
     struct Node *expression;
 };
 
+struct Index {
+    struct Node *left, *right;
+    bool address;
+};
+
+struct GetField {
+    struct Node *left;
+    const char *field;
+    bool address;
+};
+
 struct BinaryOperator {
     struct Node *left, *right;
 };
diff --git a/compiler/include/token.h b/compiler/include/token.h
@@ -19,6 +19,9 @@ enum TokenType {
     TokenAs,
     TokenConst,
     TokenTest,
+    TokenAnd,
+    TokenOr,
+    TokenNot,
     TokenAssign,
     TokenMove,
     TokenDot,
@@ -32,20 +35,26 @@ enum TokenType {
     TokenBracketOpen,
     TokenBracketClose,
     TokenBackslash,
+    TokenAmpersand,
     TokenPipe,
-    TokenAddress,
+    TokenCaret,
+    TokenTilde,
+    TokenBitwiseLeft,
+    TokenBitwiseRight,
     TokenDereference,
-    TokenIndex,
     TokenGetField,
-    TokenCaret,
     TokenSharp,
     TokenPlus,
     TokenMinus,
     TokenMult,
     TokenDiv,
+    TokenMod,
     TokenLess,
     TokenGreater,
     TokenEqual,
+    TokenLessEqual,
+    TokenGreaterEqual,
+    TokenNotEqual,
     TokenInteger,
     TokenChar,
     TokenString,