added straggler xnor

billhails · Aug 13, 2024 · 0fa359a · 0fa359a
1 parent 9108c41
commit 0fa359a
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 2 deletions.
diff --git a/src/lambda_conversion.c b/src/lambda_conversion.c
@@ -712,6 +712,16 @@ static LamExp *makeLamAnd(LamList *args, LamContext *env) {
     return result;
 }
 
+static LamExp *makeLamXnor(LamList *args) {
+    LamExp *xor = makeBinOp(LAMPRIMOP_TYPE_XOR, args);
+    int save = PROTECT(xor);
+    LamUnaryApp *not = newLamUnaryApp(CPI(args), LAMUNARYOP_TYPE_NOT, xor);
+    PROTECT(not);
+    LamExp *exp = newLamExp_Unary(CPI(not), not);
+    UNPROTECT(save);
+    return exp;
+}
+
 static LamExp *makeLamNand(LamList *args, LamContext *env) {
     // (nand a b) => (not (and a b))
     LamExp *and = makeLamAnd(args, env);
@@ -787,6 +797,8 @@ static LamExp *makePrimApp(HashSymbol *symbol, LamList *args, LamContext *env) {
         return makeLamNor(args, env);
     if (symbol == xorSymbol())
         return makeBinOp(LAMPRIMOP_TYPE_XOR, args);
+    if (symbol == xnorSymbol())
+        return makeLamXnor(args);
     if (symbol == eqSymbol())
         return makeBinOp(LAMPRIMOP_TYPE_EQ, args);
     if (symbol == neSymbol())

diff --git a/src/lexer.l b/src/lexer.l
@@ -87,6 +87,7 @@ struct PmModule *mod = yyextra;
 "or"            { return OR; }
 "nor"           { return NOR; }
 "xor"           { return XOR; }
+"xnor"           { return XNOR; }
 "print"         { return PRINT; }
 "_"             { return WILDCARD; }
 "switch"        { return SWITCH; }

diff --git a/src/parser.y b/src/parser.y
@@ -475,7 +475,7 @@ static AstArg *makeAstLookupArg(PmModule *mod, HashSymbol *nsName, HashSymbol *s
 
 %right ARROW
 %right THEN
-%left AND OR XOR NAND NOR
+%left AND OR XOR NAND NOR XNOR
 %nonassoc NOT
 %nonassoc EQ NE GT LT GE LE
 %nonassoc CMP
@@ -797,6 +797,7 @@ binop : expression THEN expression      { $$ = binOpToFunCall(mod, thenSymbol(),
       | expression AND expression       { $$ = binOpToFunCall(mod, andSymbol(), $1, $3); }
       | expression OR expression        { $$ = binOpToFunCall(mod, orSymbol(), $1, $3); }
       | expression XOR expression       { $$ = binOpToFunCall(mod, xorSymbol(), $1, $3); }
+      | expression XNOR expression      { $$ = binOpToFunCall(mod, xnorSymbol(), $1, $3); }
       | expression NOR expression       { $$ = binOpToFunCall(mod, norSymbol(), $1, $3); }
       | expression NAND expression      { $$ = binOpToFunCall(mod, nandSymbol(), $1, $3); }
       | expression EQ expression        { $$ = binOpToFunCall(mod, eqSymbol(), $1, $3); }

diff --git a/src/symbols.c b/src/symbols.c
@@ -149,6 +149,14 @@ HashSymbol *xorSymbol() {
     return res;
 }
 
+HashSymbol *xnorSymbol() {
+    static HashSymbol *res = NULL;
+    if (res == NULL) {
+        res = newSymbol("xnor");
+    }
+    return res;
+}
+
 HashSymbol *eqSymbol() {
     static HashSymbol *res = NULL;
     if (res == NULL) {

diff --git a/src/symbols.h b/src/symbols.h
@@ -65,5 +65,6 @@ HashSymbol *subSymbol(void);
 HashSymbol *thenSymbol(void);
 HashSymbol *trueSymbol(void);
 HashSymbol *xorSymbol(void);
+HashSymbol *xnorSymbol(void);
 
 #endif
diff --git a/tests/fn/test_logic.fn b/tests/fn/test_logic.fn
@@ -16,6 +16,11 @@ assert((true xor false) == true);
 assert((false xor true) == true);
 assert((false xor false) == false);
 
+assert((true xnor true) == true);
+assert((true xnor false) == false);
+assert((false xnor true) == false);
+assert((false xnor false) == true);
+
 assert((true nand true) == false);
 assert((true nand false) == true);
 assert((false nand true) == true);

diff --git a/vim/syntax/fnatural.vim b/vim/syntax/fnatural.vim
@@ -33,7 +33,7 @@ syntax match fnOperator "\v\!\="
 syntax match fnOperator "\v\<"
 syntax match fnOperator "\v\>"
 syntax match fnOperator "\v\="
-syntax keyword fnOperator and nand or nor not xor
+syntax keyword fnOperator and nand or nor not xor xnor
 highlight link fnOperator Operator
 
 syntax region fnString start=/\v'/ skip=/\v\\./ end=/\v'/