removed unused xor and not primitives

billhails · Dec 1, 2024 · edccc34 · edccc34
1 parent d8b3243
commit edccc34
Show file tree

Hide file tree

Showing 21 changed files with 1 addition and 293 deletions.
diff --git a/docs/generated/anf.md b/docs/generated/anf.md
@@ -25,8 +25,6 @@ AexpAnnotatedVar --var--> HashSymbol
 AexpPrimApp --type--> AexpPrimOp
 AexpPrimApp --exp1--> Aexp
 AexpPrimApp --exp2--> Aexp
-AexpUnaryApp --type--> AexpUnaryOp
-AexpUnaryApp --exp--> Aexp
 AexpList --exp--> Aexp
 AexpList --next--> AexpList
 AexpIntList --integer--> int
@@ -80,7 +78,6 @@ Aexp --biginteger--> MaybeBigInt
 Aexp --littleinteger--> int
 Aexp --character--> character
 Aexp --prim--> AexpPrimApp
-Aexp --unary--> AexpUnaryApp
 Aexp --makeVec--> AexpMakeVec
 Aexp --namespaces--> AexpNamespaces
 Cexp --back--> void_ptr
@@ -101,7 +98,6 @@ Exp --let--> ExpLet
 Exp --lookup--> ExpLookup
 AexpAnnotatedVarType["enum AexpAnnotatedVarType"]
 AexpPrimOp["enum AexpPrimOp"]
-AexpUnaryOp["enum AexpUnaryOp"]
 AexpNamespaceArray["AexpNamespaceArray[]"] --entries--> AexpNamespace
 CTEnvArray["CTEnvArray[]"] --entries--> CTEnv
 CexpCondCasesVal

diff --git a/docs/generated/lambda.md b/docs/generated/lambda.md
@@ -16,8 +16,6 @@ LamVarList --next--> LamVarList
 LamPrimApp --type--> LamPrimOp
 LamPrimApp --exp1--> LamExp
 LamPrimApp --exp2--> LamExp
-LamUnaryApp --type--> LamUnaryOp
-LamUnaryApp --exp--> LamExp
 LamSequence --exp--> LamExp
 LamSequence --next--> LamSequence
 LamList --exp--> LamExp
@@ -116,7 +114,6 @@ LamExp --var--> HashSymbol
 LamExp --stdint--> int
 LamExp --biginteger--> MaybeBigInt
 LamExp --prim--> LamPrimApp
-LamExp --unary--> LamUnaryApp
 LamExp --list--> LamSequence
 LamExp --makeVec--> LamMakeVec
 LamExp --construct--> LamConstruct
@@ -156,7 +153,6 @@ LamInfo --typeConstructorInfo--> LamTypeConstructorInfo
 LamInfo --namespaceInfo--> LamContext
 LamInfo --nsid--> int
 LamPrimOp["enum LamPrimOp"]
-LamUnaryOp["enum LamUnaryOp"]
 LamNamespaceArray["LamNamespaceArray[]"] --entries--> LamExp
 LamExpVal
 LamExpType

diff --git a/fn/rewrite/pratt.fn b/fn/rewrite/pratt.fn
@@ -51,7 +51,7 @@ let
                 }
                 (some(#(lex.Op(it), lexer))) {
                     expr_bp(lexer, prefix_bp(it)) => fn (#(rhs, lexer)) {
-                        [];
+                        // [];
                         loop(exp.Cons(it, [rhs]), lex.peek(lexer), lexer)
                     }
                 }

diff --git a/src/anf.yaml b/src/anf.yaml
@@ -56,10 +56,6 @@ structs:
         exp1: Aexp
         exp2: Aexp
 
-    AexpUnaryApp:
-        type: AexpUnaryOp
-        exp: Aexp
-
     AexpList:
         exp: Aexp
         next: AexpList
@@ -153,7 +149,6 @@ unions:
         littleinteger: int
         character: character
         prim: AexpPrimApp
-        unary: AexpUnaryApp
         makeVec: AexpMakeVec
         namespaces: AexpNamespaces
 
@@ -195,13 +190,9 @@ enums:
         - LE
         - GE
         - VEC
-        - XOR
         - MOD
         - CMP
 
-    AexpUnaryOp:
-        - NOT
-
 hashes:
     AnfSymbolTable: {}
 

diff --git a/src/anf_normalize.c b/src/anf_normalize.c
@@ -42,7 +42,6 @@ static Exp *normalizeVar(HashSymbol *var, Exp *tail);
 static Exp *normalizeMaybeBigInteger(MaybeBigInt *integer, Exp *tail);
 static Exp *normalizeStdInteger(int integer, Exp *tail);
 static Exp *normalizeCharacter(Character character, Exp *tail);
-static Exp *normalizeUnary(LamUnaryApp *app, Exp *tail);
 static Exp *normalizeAmb(LamAmb *app, Exp *tail);
 static Exp *normalizeSequence(LamSequence *sequence, Exp *tail);
 static Exp *normalizePrim(LamPrimApp *app, Exp *tail);
@@ -52,7 +51,6 @@ static Exp *normalizeError(Exp *tail);
 static HashSymbol *freshSymbol();
 static LamExpTable *makeLamExpHashTable();
 static Aexp *replaceLamExp(LamExp *lamExp, LamExpTable *replacements);
-static AexpUnaryOp mapUnaryOp(LamUnaryOp op);
 static Exp *letBind(Exp *body, LamExpTable *replacements);
 static AexpPrimOp mapPrimOp(LamPrimOp op);
 static Aexp *aexpNormalizeVar(HashSymbol *var);
@@ -65,8 +63,6 @@ static AexpVarList *convertVarList(LamVarList *args);
 static AexpList *replaceLamList(LamList *list, LamExpTable *replacements);
 static Aexp *replaceLamPrim(LamPrimApp *lamPrimApp,
                             LamExpTable *replacements);
-static Aexp *replaceLamUnary(LamUnaryApp *lamUnaryApp,
-                             LamExpTable *replacements);
 static Aexp *replaceLamMakeVec(LamMakeVec *makeVec,
                                LamExpTable *replacements);
 static Aexp *replaceLamConstruct(LamConstruct *construct,
@@ -113,8 +109,6 @@ static Exp *normalize(LamExp *lamExp, Exp *tail) {
             return normalizeMaybeBigInteger(lamExp->val.biginteger, tail);
         case LAMEXP_TYPE_PRIM:
             return normalizePrim(lamExp->val.prim, tail);
-        case LAMEXP_TYPE_UNARY:
-            return normalizeUnary(lamExp->val.unary, tail);
         case LAMEXP_TYPE_AMB:
             return normalizeAmb(lamExp->val.amb, tail);
         case LAMEXP_TYPE_LIST:
@@ -535,27 +529,6 @@ static Exp *wrapTail(Exp *exp, Exp *tail) {
     return exp;
 }
 
-static Exp *normalizeUnary(LamUnaryApp *app, Exp *tail) {
-    ENTER(normalizeUnary);
-    LamExpTable *replacements = makeLamExpHashTable();
-    int save = PROTECT(replacements);
-    Aexp *aexp = replaceLamExp(app->exp, replacements);
-    int save2 = PROTECT(aexp);
-    AexpUnaryApp *aexpUnaryApp = newAexpUnaryApp(mapUnaryOp(app->type), aexp);
-    UNPROTECT(save2);
-    save2 = PROTECT(aexpUnaryApp);
-    Aexp *aexp2 = newAexp_Unary(aexpUnaryApp);
-    REPLACE_PROTECT(save2, aexp2);
-    Exp *exp = wrapAexp(aexp2);
-    REPLACE_PROTECT(save2, exp);
-    exp = wrapTail(exp, tail);
-    REPLACE_PROTECT(save2, exp);
-    Exp *res = letBind(exp, replacements);
-    UNPROTECT(save);
-    LEAVE(normalizeUnary);
-    return res;
-}
-
 static Exp *normalizePrim(LamPrimApp *app, Exp *tail) {
     ENTER(normalizePrim);
     LamExpTable *replacements = makeLamExpHashTable();
@@ -930,9 +903,6 @@ static Aexp *replaceLamExp(LamExp *lamExp, LamExpTable *replacements) {
         case LAMEXP_TYPE_PRIM:
             res = replaceLamPrim(lamExp->val.prim, replacements);
             break;
-        case LAMEXP_TYPE_UNARY:
-            res = replaceLamUnary(lamExp->val.unary, replacements);
-            break;
         case LAMEXP_TYPE_PRINT:
             res = replaceLamPrint(lamExp->val.print, replacements);
             break;
@@ -995,7 +965,6 @@ static bool lamExpIsLambda(LamExp *val) {
         case LAMEXP_TYPE_ERROR:
         case LAMEXP_TYPE_AMB:
         case LAMEXP_TYPE_PRIM:
-        case LAMEXP_TYPE_UNARY:
         case LAMEXP_TYPE_LIST:
         case LAMEXP_TYPE_APPLY:
         case LAMEXP_TYPE_IFF:
@@ -1120,28 +1089,6 @@ static Aexp *replaceLamPrim(LamPrimApp *lamPrimApp, LamExpTable *replacements) {
     return res;
 }
 
-static Aexp *replaceLamUnary(LamUnaryApp *lamUnaryApp,
-                             LamExpTable *replacements) {
-    ENTER(replaceLamUnary);
-    Aexp *exp = replaceLamExp(lamUnaryApp->exp, replacements);
-    int save = PROTECT(exp);
-    AexpUnaryApp *unary = newAexpUnaryApp(mapUnaryOp(lamUnaryApp->type), exp);
-    PROTECT(unary);
-    Aexp *res = newAexp_Unary(unary);
-    UNPROTECT(save);
-    LEAVE(replaceLamUnary);
-    return res;
-}
-
-static AexpUnaryOp mapUnaryOp(LamUnaryOp op) {
-    switch (op) {
-        case LAMUNARYOP_TYPE_NOT:
-            return AEXPUNARYOP_TYPE_NOT;
-        default:
-            cant_happen("unrecognised type %d in mapUnaryOp", op);
-    }
-}
-
 static AexpPrimOp mapPrimOp(LamPrimOp op) {
     switch (op) {
         case LAMPRIMOP_TYPE_ADD:
@@ -1168,8 +1115,6 @@ static AexpPrimOp mapPrimOp(LamPrimOp op) {
             return AEXPPRIMOP_TYPE_LE;
         case LAMPRIMOP_TYPE_VEC:
             return AEXPPRIMOP_TYPE_VEC;
-        case LAMPRIMOP_TYPE_XOR:
-            return AEXPPRIMOP_TYPE_XOR;
         case LAMPRIMOP_TYPE_MOD:
             return AEXPPRIMOP_TYPE_MOD;
         case LAMPRIMOP_TYPE_CMP:

diff --git a/src/anf_pp.c b/src/anf_pp.c
@@ -122,9 +122,6 @@ void ppAexpPrimApp(AexpPrimApp *x) {
         case AEXPPRIMOP_TYPE_LE:
             eprintf("le ");
             break;
-        case AEXPPRIMOP_TYPE_XOR:
-            eprintf("xor ");
-            break;
         case AEXPPRIMOP_TYPE_VEC:
             eprintf("vec ");
             break;
@@ -148,19 +145,6 @@ void ppAexpPrimApp(AexpPrimApp *x) {
     eprintf(")");
 }
 
-void ppAexpUnaryApp(AexpUnaryApp *x) {
-    eprintf("(");
-    switch (x->type) {
-        case AEXPUNARYOP_TYPE_NOT:
-            eprintf("not ");
-            break;
-        default:
-            cant_happen("unrecognized op in ppAexpUnaryApp (%d)", x->type);
-    }
-    ppAexp(x->exp);
-    eprintf(")");
-}
-
 static void ppAexpListContents(AexpList *x) {
     while (x != NULL) {
         ppAexp(x->exp);
@@ -390,9 +374,6 @@ void ppAexp(Aexp *x) {
         case AEXP_TYPE_PRIM:
             ppAexpPrimApp(x->val.prim);
             break;
-        case AEXP_TYPE_UNARY:
-            ppAexpUnaryApp(x->val.unary);
-            break;
         case AEXP_TYPE_MAKEVEC:
             ppAexpMakeVec(x->val.makeVec);
             break;

diff --git a/src/anf_pp.h b/src/anf_pp.h
@@ -32,7 +32,6 @@ void ppAexpVarList(AexpVarList *x);
 void ppAexpVar(HashSymbol *x);
 void ppAexpAnnotatedVar(AexpAnnotatedVar *x);
 void ppAexpPrimApp(AexpPrimApp *x);
-void ppAexpUnaryApp(AexpUnaryApp *x);
 void ppAexpList(AexpList *x);
 void ppAexpIntList(AexpIntList *x);
 void ppAexpMakeList(AexpList *x);

diff --git a/src/annotate.c b/src/annotate.c
@@ -43,7 +43,6 @@ static CTEnv *annotateExp(Exp *x, CTEnv *env);
 static CTEnv *annotateAexpLam(AexpLam *x, CTEnv *env);
 static AexpAnnotatedVar *annotateAexpVar(HashSymbol *x, CTEnv *env);
 static CTEnv *annotateAexpPrimApp(AexpPrimApp *x, CTEnv *env);
-static CTEnv *annotateAexpUnaryApp(AexpUnaryApp *x, CTEnv *env);
 static CTEnv *annotateAexpList(AexpList *x, CTEnv *env);
 static CTEnv *annotateCexpApply(CexpApply *x, CTEnv *env);
 static CTEnv *annotateCexpIf(CexpIf *x, CTEnv *env);
@@ -119,18 +118,6 @@ static CTEnv *annotateAexpPrimApp(AexpPrimApp *x, CTEnv *env) {
     return env;
 }
 
-static CTEnv *annotateAexpUnaryApp(AexpUnaryApp *x, CTEnv *env) {
-#ifdef DEBUG_ANNOTATE2
-    eprintf("annotateAexpPrimApp ");
-    ppAexpUnaryApp(x);
-    eprintf("  ");
-    ppCTEnv(env);
-    eprintf("\n");
-#endif
-    annotateAexp(x->exp, env);
-    return env;
-}
-
 static CTEnv *annotateAexpList(AexpList *x, CTEnv *env) {
 #ifdef DEBUG_ANNOTATE2
     eprintf("annotateAexpList ");
@@ -387,8 +374,6 @@ static CTEnv *annotateAexp(Aexp *x, CTEnv *env) {
             return env;
         case AEXP_TYPE_PRIM:
             return annotateAexpPrimApp(x->val.prim, env);
-        case AEXP_TYPE_UNARY:
-            return annotateAexpUnaryApp(x->val.unary, env);
         case AEXP_TYPE_MAKEVEC:
             return annotateAexpMakeVec(x->val.makeVec, env);
         case AEXP_TYPE_NAMESPACES:

diff --git a/src/bytecode.c b/src/bytecode.c
@@ -196,23 +196,6 @@ void writeAexpAnnotatedVar(AexpAnnotatedVar *x, ByteCodeArray *b) {
     LEAVE(writeAexpAnnotatedVar);
 }
 
-void writeAexpUnaryApp(AexpUnaryApp *x, ByteCodeArray *b) {
-    ENTER(writeAexpUnaryApp);
-    if (x == NULL)
-        return;
-    writeAexp(x->exp, b);
-    Byte prim;
-    switch (x->type) {
-        case AEXPUNARYOP_TYPE_NOT:
-            prim = BYTECODES_TYPE_PRIM_NOT;
-            break;
-        default:
-            cant_happen("unrecognised AexpUnaryOp in writeAexpUnaryApp");
-    }
-    addByte(b, prim);
-    LEAVE(writeAexpUnaryApp);
-}
-
 void writeAexpPrimApp(AexpPrimApp *x, ByteCodeArray *b) {
     ENTER(writeAexpPrimApp);
     if (x == NULL)
@@ -257,9 +240,6 @@ void writeAexpPrimApp(AexpPrimApp *x, ByteCodeArray *b) {
         case AEXPPRIMOP_TYPE_LE:
             prim = BYTECODES_TYPE_PRIM_LE;
             break;
-        case AEXPPRIMOP_TYPE_XOR:
-            prim = BYTECODES_TYPE_PRIM_XOR;
-            break;
         case AEXPPRIMOP_TYPE_VEC:
             prim = BYTECODES_TYPE_PRIM_VEC;
             break;
@@ -652,10 +632,6 @@ void writeAexp(Aexp *x, ByteCodeArray *b) {
                 writeAexpPrimApp(x->val.prim, b);
             }
             break;
-        case AEXP_TYPE_UNARY:{
-                writeAexpUnaryApp(x->val.unary, b);
-            }
-            break;
         case AEXP_TYPE_MAKEVEC:{
                 writeAexpMakeVec(x->val.makeVec, b);
             }

diff --git a/src/bytecode.h b/src/bytecode.h
@@ -40,7 +40,6 @@ void resetByteCodeArray(ByteCodeArray *b);
 void writeAexpLam(AexpLam *x, ByteCodeArray *b);
 void writeAexpAnnotatedVar(AexpAnnotatedVar *x, ByteCodeArray *b);
 void writeAexpPrimApp(AexpPrimApp *x, ByteCodeArray *b);
-void writeAexpUnaryApp(AexpUnaryApp *x, ByteCodeArray *b);
 void writeAexpList(AexpList *x, ByteCodeArray *b);
 void writeCexpApply(CexpApply *x, ByteCodeArray *b);
 void writeCexpIf(CexpIf *x, ByteCodeArray *b);

diff --git a/src/cekfs.yaml b/src/cekfs.yaml
@@ -121,10 +121,8 @@ enums:
     - PRIM_LT
     - PRIM_GE
     - PRIM_LE
-    - PRIM_XOR
     - PRIM_MAKEVEC
     - PRIM_VEC
-    - PRIM_NOT
     - MATCH
     - APPLY
     - IF

diff --git a/src/debug.c b/src/debug.c
@@ -107,14 +107,6 @@ void dumpByteCode(ByteCodeArray *bca) {
                     eprintf("CMP\n");
                 }
                 break;
-            case BYTECODES_TYPE_PRIM_XOR:{
-                    eprintf("XOR\n");
-                }
-                break;
-            case BYTECODES_TYPE_PRIM_NOT:{
-                    eprintf("NOT\n");
-                }
-                break;
             case BYTECODES_TYPE_PRIM_MAKEVEC:{
                     int size = readByte(bca, &i);
                     eprintf("MAKEVEC [%d]\n", size);
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,7 +51,7 @@ let @@
                     }
                     (some(#(lex.Op(it), lexer))) {
                         expr_bp(lexer, prefix_bp(it)) => fn (#(rhs, lexer)) {
-                            [];
+                            // [];
                             loop(exp.Cons(it, [rhs]), lex.peek(lexer), lexer)
                         }
                     }
@@ Expand Down @@