start adding v45 keywords

Author: totalspectrum

frontends/lexer.c

@@ -2095,7 +2095,13 @@ getSpinToken(LexStream *L, AST **ast_ptr)
     } else if (c == ':') {
         peekc = lexgetc(L);
         if (peekc == '=') {
-            c = SP_ASSIGN;
+            peekc = lexgetc(L);
+            if (peekc == ':') {
+                c = SP_SWAP_OP; /* :=: swap operator */
+            } else {
+                lexungetc(L, peekc);
+                c = SP_ASSIGN;
+            }
         } else if (isIdentifierStart(peekc) && InDatBlock(L)) {
             lexungetc(L, peekc);
             if (gl_p2) {
@@ -2437,10 +2443,14 @@ struct reservedword_soft {
     { "longs", SP_LONGS, 42, 42 },
     { "words", SP_WORDS, 42, 42 },
 
-    /* new v44 keywords */
-    { "fill", SP_FILL, 44, 0 },
-    { "copy", SP_COPY, 44, 0 },
-    { "swap", SP_SWAP, 44, 0 },
+    /* new v44 keywords, taken away in v45 */
+    { "fill", SP_FILL, 44, 44 },
+    { "copy", SP_COPY, 44, 44 },
+    { "swap", SP_SWAP, 44, 44 },
+
+    /* new v45 keywords */
+    { "sizeof", SP_SIZEOF, 45, 0 },
+    { "struct", SP_STRUCT, 45, 0 },
 
 };
 

frontends/spin/spin.y

@@ -393,6 +393,11 @@ SpinDeclareStruct(AST *ident, AST *defs)
 %token SP_SWAP       "SWAP"
 %token SP_COMP       "COMP"
 
+/* v45 additions */
+%token SP_STRUCT     "STRUCT"
+%token SP_SIZEOF     "SIZEOF"
+%token SP_SWAP_OP    ":=:"
+
 /* operators */
 %token SP_ASSIGN     ":="
 %token SP_XOR        "XOR (^^)"
@@ -478,7 +483,7 @@ SpinDeclareStruct(AST *ident, AST *defs)
 %token SP_DAT_RBRACK "] in DAT"
 
 /* operator precedence */
-%right SP_ASSIGN
+%right SP_ASSIGN SP_SWAP_OP
 %left '\\'
 %right SP_THEN
 %right SP_ELSE
@@ -1070,6 +1075,14 @@ conline:
         SpinDeclareStruct(name, defs);
         $$ = NULL;
     }
+  | SP_STRUCT SP_IDENTIFIER '(' structlist ')' SP_EOLN
+    {
+        /* basically an inline object definition */
+        AST *defs = $4;
+        AST *name = $2;
+        SpinDeclareStruct(name, defs);
+        $$ = NULL;
+    }
   | SP_IDENTIFIER '(' string optobjparams ')' SP_EOLN
     {
         /* basically an inline object definition */
@@ -1954,6 +1967,29 @@ expr:
     { $$ = $1; }
   | SP_IF expr SP_THEN expr SP_ELSE expr
     { $$ = NewAST(AST_CONDRESULT, $2, NewAST(AST_THENELSE, $4, $6)); }
+  | lhs SP_SWAP_OP expr
+    {
+        AST *dst = $1;
+        AST *src = $3;
+        AST *check = NewAST(AST_STATIC_ASSERT,
+                            NewAST(AST_SAMETYPES,
+                                   NewAST(AST_TYPEOF, dst, NULL),
+                                   NewAST(AST_TYPEOF, src, NULL)),
+                            AstStringPtr("Parameters to :=: must have the same type"));
+        AST *dstptr = NewAST(AST_ADDROF, dst, NULL);
+        AST *srcptr = NewAST(AST_ADDROF, src, NULL);
+        AST *copyparams = NewAST(AST_EXPRLIST,
+                                 dstptr,
+                                 NewAST(AST_EXPRLIST,
+                                        srcptr,
+                                        NewAST(AST_EXPRLIST,
+                                               NewAST(AST_SIZEOF, src, NULL),
+                                               NULL)));
+        AST *copy = NewAST(AST_FUNCCALL,
+                           AstIdentifier("__builtin_swapdata"),
+                           copyparams);
+        $$ = NewAST(AST_SEQUENCE, check, copy);
+    }  
   ;
 
 lhs: identifier