Avoid symbol name clashes by marking things as static

The C static keyword sets the scope of the name to the containing file.

Signed-off-by: Stefan Marr <[email protected]>

Author: smarr

src/compiler/Parser.c

@@ -221,64 +221,64 @@ static char* symnames[] = {
 #pragma mark intern Prototypes
 
 
-void fillbuffer(void);
-bool eob(void);
-void skipWhiteSpace(void);
-void skipComment(void);
-void getsym(void);
-void peek(void);
-bool symIn(Symbol* ss);
-bool acceptXXX(Symbol s);
-bool acceptOneOf(Symbol* ss);
-bool expect(Symbol s);
-bool expectOneOf(Symbol* ss);
-void SingleOperator(void);
-void classdef(void);
-void instanceFields(class_generation_context* cgenc);
-void classFields(class_generation_context* cgenc);
-void method(method_generation_context* mgenc);
-void primitiveBlock(void);
-void pattern(method_generation_context* mgenc);
-void unaryPattern(method_generation_context* mgenc);
-void binaryPattern(method_generation_context* mgenc);
-void keywordPattern(method_generation_context* mgenc);
-void methodBlock(method_generation_context* mgenc);
-pVMSymbol unarySelector(void);
-pVMSymbol binarySelector(void);
-char* identifier(void);
-pString keyword(void);
-char* argument(void);
-void blockContents(method_generation_context* mgenc);
-void locals(method_generation_context* mgenc);
-void blockBody(method_generation_context* mgenc, bool seen_period);
-void result(method_generation_context* mgenc);
-void expression(method_generation_context* mgenc);
-void assignation(method_generation_context* mgenc);
-void assignments(method_generation_context* mgenc, pList l);
-pString assignment(method_generation_context* mgenc);
-void evaluation(method_generation_context* mgenc);
-void primary(method_generation_context* mgenc, bool* super);
-char* variable(void);
-void messages(method_generation_context* mgenc, bool super);
-void unaryMessage(method_generation_context* mgenc, bool super);
-void binaryMessage(method_generation_context* mgenc, bool super);
-void binaryOperand(method_generation_context* mgenc, bool* super);
-void keywordMessage(method_generation_context* mgenc, bool super);
-void formula(method_generation_context* mgenc);
-void nestedTerm(method_generation_context* mgenc);
-void literal(method_generation_context* mgenc);
-void literalNumber(method_generation_context* mgenc);
-uint64_t literalDecimal(void);
- int64_t negativeDecimal(void);
-uint64_t literalInteger(void);
-void literalSymbol(method_generation_context* mgenc);
-void literalString(method_generation_context* mgenc);
-pVMSymbol selector(void);
-pVMSymbol keywordSelector(void);
-char* string(void);
-void nestedBlock(method_generation_context* mgenc);
-void blockPattern(method_generation_context* mgenc);
-void blockArguments(method_generation_context* mgenc);
+static void fillbuffer(void);
+static bool eob(void);
+static void skipWhiteSpace(void);
+static void skipComment(void);
+static void getsym(void);
+static void peek(void);
+static bool symIn(Symbol* ss);
+static bool accept(Symbol s);
+static bool acceptOneOf(Symbol* ss);
+static bool expect(Symbol s);
+static bool expectOneOf(Symbol* ss);
+static void SingleOperator(void);
+static void classdef(void);
+static void instanceFields(class_generation_context* cgenc);
+static void classFields(class_generation_context* cgenc);
+static void method(method_generation_context* mgenc);
+static void primitiveBlock(void);
+static void pattern(method_generation_context* mgenc);
+static void unaryPattern(method_generation_context* mgenc);
+static void binaryPattern(method_generation_context* mgenc);
+static void keywordPattern(method_generation_context* mgenc);
+static void methodBlock(method_generation_context* mgenc);
+static pVMSymbol unarySelector(void);
+static pVMSymbol binarySelector(void);
+static char* identifier(void);
+static pString keyword(void);
+static char* argument(void);
+static void blockContents(method_generation_context* mgenc);
+static void locals(method_generation_context* mgenc);
+static void blockBody(method_generation_context* mgenc, bool seen_period);
+static void result(method_generation_context* mgenc);
+static void expression(method_generation_context* mgenc);
+static void assignation(method_generation_context* mgenc);
+static void assignments(method_generation_context* mgenc, pList l);
+static pString assignment(method_generation_context* mgenc);
+static void evaluation(method_generation_context* mgenc);
+static void primary(method_generation_context* mgenc, bool* super);
+static char* variable(void);
+static void messages(method_generation_context* mgenc, bool super);
+static void unaryMessage(method_generation_context* mgenc, bool super);
+static void binaryMessage(method_generation_context* mgenc, bool super);
+static void binaryOperand(method_generation_context* mgenc, bool* super);
+static void keywordMessage(method_generation_context* mgenc, bool super);
+static void formula(method_generation_context* mgenc);
+static void nestedTerm(method_generation_context* mgenc);
+static void literal(method_generation_context* mgenc);
+static void literalNumber(method_generation_context* mgenc);
+static uint64_t literalDecimal(void);
+static int64_t negativeDecimal(void);
+static uint64_t literalInteger(void);
+static void literalSymbol(method_generation_context* mgenc);
+static void literalString(method_generation_context* mgenc);
+static pVMSymbol selector(void);
+static pVMSymbol keywordSelector(void);
+static char* string(void);
+static void nestedBlock(method_generation_context* mgenc);
+static void blockPattern(method_generation_context* mgenc);
+static void blockArguments(method_generation_context* mgenc);
 
 
 //
@@ -289,15 +289,15 @@ void blockArguments(method_generation_context* mgenc);
 #pragma mark File local variables
 
 
-FILE* infile;
+static FILE* infile;
 
-Symbol sym;
-char symc;
+static Symbol sym;
+static char symc;
 static char text[BUFSIZ];
 
-bool peekDone;
-Symbol nextSym;
-char nextSymc;
+static bool peekDone;
+static Symbol nextSym;
+static char nextSymc;
 static char nextText[BUFSIZ];
 
 
@@ -307,7 +307,7 @@ static char nextText[BUFSIZ];
 
 
 static char buf[BUFSIZ];
-int bufp;
+static int bufp;
 
 
 #pragma mark Stream handling
@@ -551,7 +551,7 @@ bool symIn(Symbol* ss) {
 }
 
 
-bool acceptXXX(Symbol s) {
+bool accept(Symbol s) {
     if(sym == s) {
         getsym();
         return true;
@@ -573,7 +573,7 @@ bool acceptOneOf(Symbol* ss) {
 
 
 bool expect(Symbol s) {
-    if(acceptXXX(s))
+    if(accept(s))
         return true;
     fprintf(stderr, "Error: unexpected symbol. Expected %s, but found %s", 
             symnames[s], symnames[sym]);
@@ -676,7 +676,7 @@ void Parser_classdef(class_generation_context* cgenc) {
 
     if(sym == Identifier) {
         cgenc->super_name = Universe_symbol_for(text);
-        acceptXXX(Identifier);
+        accept(Identifier);
     } else
         cgenc->super_name = Universe_symbol_for("Object");
 
@@ -702,7 +702,7 @@ void Parser_classdef(class_generation_context* cgenc) {
         method_genc_release(&mgenc);
     }
 
-    if(acceptXXX(Separator)) {
+    if(accept(Separator)) {
         cgenc->class_side = true;
         classFields(cgenc);
         while(sym == Identifier || sym == Keyword || sym == OperatorSequence ||
@@ -730,7 +730,7 @@ void Parser_classdef(class_generation_context* cgenc) {
 
 
 void instanceFields(class_generation_context* cgenc) {
-    if(acceptXXX(Or)) {
+    if(accept(Or)) {
         while(sym == Identifier) {
             char* var = variable();
             SEND(cgenc->instance_fields, add, Universe_symbol_for(var));
@@ -742,7 +742,7 @@ void instanceFields(class_generation_context* cgenc) {
 
 
 void classFields(class_generation_context* cgenc) {
-    if(acceptXXX(Or)) {
+    if(accept(Or)) {
         while(sym == Identifier) {
             char* var = variable();
             SEND(cgenc->class_fields, add, Universe_symbol_for(var));
@@ -843,17 +843,17 @@ pVMSymbol unarySelector(void) {
 pVMSymbol binarySelector(void) {
     pVMSymbol symb = Universe_symbol_for(text);
 
-    if(acceptXXX(Or))
+    if(accept(Or))
         ;
-    else if(acceptXXX(Comma))
+    else if(accept(Comma))
         ;
-    else if(acceptXXX(Minus))
+    else if(accept(Minus))
         ;
-    else if(acceptXXX(Equal))
+    else if(accept(Equal))
         ;
     else if(acceptOneOf(singleOpSyms))
         ;
-    else if(acceptXXX(OperatorSequence))
+    else if(accept(OperatorSequence))
         ;
     else
         expect(NONE);
@@ -864,7 +864,7 @@ pVMSymbol binarySelector(void) {
 
 char* identifier(void) {
     char* s = internal_allocate_string(text);
-    if(acceptXXX(Primitive))
+    if(accept(Primitive))
         ; // text is set
     else
         expect(Identifier);
@@ -887,7 +887,7 @@ char* argument(void) {
 
 
 void blockContents(method_generation_context* mgenc) {
-    if(acceptXXX(Or)) {
+    if(accept(Or)) {
         locals(mgenc);
         expect(Or);
     }
@@ -905,7 +905,7 @@ void locals(method_generation_context* mgenc) {
 
 
 void blockBody(method_generation_context* mgenc, bool seen_period) {
-    if(acceptXXX(Exit))
+    if(accept(Exit))
         result(mgenc);
     else if(sym == EndBlock) {
         if(seen_period)
@@ -924,7 +924,7 @@ void blockBody(method_generation_context* mgenc, bool seen_period) {
         mgenc->finished = true;
     } else {
         expression(mgenc);
-        if(acceptXXX(Period)) {
+        if(accept(Period)) {
             emit_POP(mgenc);
             blockBody(mgenc, true);
         }
@@ -939,7 +939,7 @@ void result(method_generation_context* mgenc) {
     else
         emit_RETURN_LOCAL(mgenc);
     mgenc->finished = true;
-    acceptXXX(Period);
+    accept(Period);
 }