include/Data.h

@@ -19,6 +19,7 @@ extern_ struct SymbolTable Symbols[SYMBOLS];
 extern_ int   TypeSizes[9];
 extern_ char* TypeNames[9];
 
+extern_ char* TokenStrings[];
 extern_ char* TokenNames[];
 
 extern_ int CurrentFunction;
@@ -30,6 +31,3 @@ extern_ FILE* OutputFile;
 
 extern_ struct Token CurrentToken;
 extern_ char CurrentIdentifier[TEXTLEN + 1];
-
-extern_ int CurrentGlobal;
-extern_ int CurrentLocal;

include/Defs.h

@@ -196,17 +196,6 @@ struct SymbolTable {
     int Structure;  // An entry in StructureType - metadata on how to process the data
     int EndLabel;   // The number of the label to jump to, in order to exit this function (if applicable)
     int Length;     // The length of the symbol in units of 1 element -- the size of an array, for example.
-    int Storage;    // The scope of this symbol - decides when it is discarded.
-    int SinkOffset; // How many times must we sink the rbp to get to this symbol in the stack?
-};
-
-enum StorageScope {
-    SC_GLOBAL = 1,  // Global Scope
-  //SC_CLASS,       // Class-local definitions
-  //SC_STATIC,      // Static storage definitions
-  //SC_PARAM,       // Function parameters
-    SC_LOCAL        // Function-local scope.
-                    //  There is no deeper scope than function.
 };
 
 
@@ -325,7 +314,7 @@ struct ASTNode* PrintStatement(void);
 
 int FindSymbol(char* Symbol);
 
-int AddSymbol(char* Name, int Type, int Structure, int Storage, int EndLabel, int Length);
+int AddSymbol(char* Name, int Type, int Structure, int Size);
 
 int AddFunctionSymbol(char* Name, int Type, int Structure, int EndLabel, int Size);
 

src/Main.c

@@ -12,6 +12,7 @@
 
 int TypeSizes[9] = { 0,      1,      4,     8,      0,      8,         8,        8,         8}; // in BYTES
 
+char* TokenStrings[] = { "+", "-", "*", "/", "int" };
 char* TokenNames[] = {
     "End of file",
     "Equivalency",

src/Symbols.c

@@ -9,15 +9,15 @@
 
 static int GlobalSymbols = 0;
 
-
-int FindSymbolImpl(char* Symbol, int Storage) {
+/*
+ * Find the position of a symbol in the symbol table.
+ *  @Return the index into the symbol table if found,
+ *      -1 if not found.
+ */
+int FindSymbol(char* Symbol) {
     int Ind;
 
-    for(Ind = 0; Ind < (Storage == SC_GLOBAL /* Are we global scope? */
-             ?  CurrentGlobal /* If so, start searching at the start */
-             : SYMBOLS /* Otherwise, start at the end and work backward */ 
-              ); Ind++) {
-
+    for(Ind = 0; Ind < GlobalSymbols; Ind++) {
         if(*Symbol == *Symbols[Ind].Name && !strcmp(Symbol, Symbols[Ind].Name))
             return Ind;
     }
@@ -25,93 +25,50 @@ int FindSymbolImpl(char* Symbol, int Storage) {
     return -1;
 }
 
-/*
- * Find the position of a symbol in the symbol table.
- *  @Return the index into the symbol table if found,
- *      -1 if not found.
- *          Does not care about differentiating local or global.
- *           It will only be consistent.
- */
-int FindSymbol(char* Symbol) {
-    int Res;
-    // Prioritise local vars
-    if((Res = FindSymbolImpl(Symbol, SC_LOCAL)) == -1)
-        // Fallback to global vars.
-        return FindSymbolImpl(Symbol, SC_GLOBAL);
-    return Res;
-}
-
 /*
  * Append a new entry to the table of global symbols.
  *  @Return the index to the new entry
  * 
  * Will kill the program if we run out.
- *  The death condition here is running into the local symbol table.
  *  //TODO: Dump symbols on death?
  */
-static int NewGlobalSymbol() {
+static int NewSymbol(void) {
     int Pos;
 
-    if((Pos = (CurrentGlobal++)) >= CurrentLocal)
-        Die("Too many Global symbols");
+    if((Pos = GlobalSymbols++) >= SYMBOLS)
+        Die("Too many symbols");
     
     return Pos;
 }
 
-/*
- * Append a new entry to the table of local (function-local) symbols.
- *  @Return the index to the new entry
- * 
- * Will kill the program if we run out.
- *  The death condition here is running into the global symbol table.
- *  //TODO: Dump symbols on death?
- */
-static int NewLocalSymbol() {
-    int Pos;
-    if((Pos = (CurrentLocal--)) <= CurrentGlobal)
-        Die("Too many Local symbols");
+// TODO: this is going weird!
 
-    return Pos;
+int AddArraySymbol(char* Name, int Type, int Structure, int EndLabel, int Size) {
+    int Slot;
+    Slot = AddFunctionSymbol(Name, Type, Structure, EndLabel, Size);
+    return Slot;
 }
 
-/*
- * Add a symbol to the tables, and set all the metadata.
- *  @param Name:      The string representing the name of the symbol.
- *  @param Type:      The return type in terms of DataTypes enum values.
- *  @param Structure: The type of symbol this is, in terms of StructureType enum.
- *  @param Storage:   The storage scope of this symbol. For functions this is always SC_GLOBAL (for now). Vars and Arrays can be GLOBAL or SC_LOCAL.
- *  @param EndLabel:  The label # to jump to to exit the function or array, where appropriate.  
- *  @param Length:    The size of the struct/array in units of 1xbase
- * 
- *  @return The ID in the symbol table that now represents this symbol.
- */
-int AddSymbol(char* Name, int Type, int Structure, int Storage, int EndLabel, int Length) {
+int AddFunctionSymbol(char* Name, int Type, int Structure, int EndLabel, int Size) {
+    int Slot;
+    Slot = AddSymbol(Name, Type, Structure, Size);
+    Symbols[Slot].EndLabel = EndLabel;
+    return Slot;
+}
+
+int AddSymbol(char* Name, int Type, int Structure, int Size) {
 
     int TableSlot;
-    int SinkOffset = 0;
 
-    if((TableSlot = FindSymbol(Name, Storage) != -1))
+    if((TableSlot = FindSymbol(Name) != -1))
         return TableSlot;
     
-    // Instaed of spliting this up into AddLocalSymbol and AddGlobalSymbol,
-    //  we can use this switch to avoid duplicated code.
-    switch(Storage) {
-        case SC_GLOBAL:
-            TableSlot = NewGlobalSymbol();
-            AsGlobalSymbol(TableSlot);
-            break;
-        case SC_LOCAL:
-            TableSlot = NewLocalSymbol();
-            SinkOffset = AsCalcOffset(Type, 0);
-            break;
-    }
+    TableSlot = NewSymbol();
 
     Symbols[TableSlot].Name = strdup(Name);
     Symbols[TableSlot].Type = Type;
     Symbols[TableSlot].Structure = Structure;
-    Symbols[TableSlot].Storage = Storage;
-    Symbols[TableSlot].Length = Length;
-    Symbols[TableSlot].SinkOffset = SinkOffset;
+    Symbols[TableSlot].Length = Size;
 
     //printf("Adding new variable %s of type %s to the table at %d\n", CurrentIdentifier, Types[Type], TableSlot);
     return TableSlot;