Clean up global declarations

source/compiler/sc.h

@@ -617,6 +617,7 @@ SC_FUNC void setline(int chkbounds);
 SC_FUNC void setfiledirect(char *name);
 SC_FUNC void setfileconst(char *name);
 SC_FUNC void setlinedirect(int line);
+SC_FUNC void setlineconst(int line);
 SC_FUNC void setlabel(int index);
 SC_FUNC void markexpr(optmark type,const char *name,cell offset);
 SC_FUNC void startfunc(char *fname);

source/compiler/sc2.c

@@ -431,8 +431,7 @@ static void readline(unsigned char *line)
       line+=strlen((char*)line);
     } /* if */
     fline+=1;
-    assert(line_sym!=NULL);
+    setlineconst(fline);
-    line_sym->addr=fline;
   } while (num>=0 && cont);
 }
 

source/compiler/sc4.c

@@ -287,6 +287,12 @@ SC_FUNC void setlinedirect(int line)
   } /* if */
 }
 
+SC_FUNC void setlineconst(int line)
+{
+  assert(line_sym!=NULL);
+  line_sym->addr=line;
+}
+
 /*  setlabel
  *
  *  Post a code label (specified as a number), on a new line.

source/compiler/scvars.c

@@ -34,53 +34,53 @@
 SC_VDEFINE symbol loctab;                   /* local symbol table */
 SC_VDEFINE symbol glbtab;                   /* global symbol table */
 SC_VDEFINE struct hashmap symbol_cache_map;
-SC_VDEFINE symbol *line_sym=NULL;
 SC_VDEFINE cell *litq;                      /* the literal queue */
 SC_VDEFINE unsigned char pline[sLINEMAX+1]; /* the line read from the input file */
 SC_VDEFINE const unsigned char *lptr;       /* points to the current position in "pline" */
-SC_VDEFINE constvalue tagname_tab = { NULL, "", 0, 0};  /* tagname table */
+SC_VDEFINE constvalue tagname_tab={ NULL, "", 0, 0};  /* tagname table */
-SC_VDEFINE constvalue libname_tab = { NULL, "", 0, 0};  /* library table (#pragma library "..." syntax) */
+SC_VDEFINE constvalue libname_tab={ NULL, "", 0, 0};  /* library table (#pragma library "..." syntax) */
-SC_VDEFINE constvalue *curlibrary = NULL;   /* current library */
+SC_VDEFINE constvalue *curlibrary=NULL;     /* current library */
-SC_VDEFINE int pc_addlibtable = TRUE;       /* is the library table added to the AMX file? */
+SC_VDEFINE int pc_addlibtable=TRUE;         /* is the library table added to the AMX file? */
 SC_VDEFINE symbol *curfunc;                 /* pointer to current function */
 SC_VDEFINE char *inpfname;                  /* pointer to name of the file currently read from */
 SC_VDEFINE char outfname[_MAX_PATH];        /* intermediate (assembler) file name */
 SC_VDEFINE char binfname[_MAX_PATH];        /* binary file name */
 SC_VDEFINE char errfname[_MAX_PATH];        /* error file name */
-SC_VDEFINE char sc_ctrlchar = CTRL_CHAR;    /* the control character (or escape character)*/
+SC_VDEFINE char sc_ctrlchar=CTRL_CHAR;      /* the control character (or escape character)*/
-SC_VDEFINE char sc_ctrlchar_org = CTRL_CHAR;/* the default control character */
+SC_VDEFINE char sc_ctrlchar_org=CTRL_CHAR;  /* the default control character */
-SC_VDEFINE int litidx    = 0;               /* index to literal table */
+SC_VDEFINE int litidx=0;                    /* index to literal table */
-SC_VDEFINE int litmax    = sDEF_LITMAX;     /* current size of the literal table */
+SC_VDEFINE int litmax=sDEF_LITMAX;          /* current size of the literal table */
-SC_VDEFINE int stgidx    = 0;      /* index to the staging buffer */
+SC_VDEFINE int stgidx=0;                    /* index to the staging buffer */
-SC_VDEFINE int sc_labnum = 0;      /* number of (internal) labels */
+SC_VDEFINE int sc_labnum=0;                 /* number of (internal) labels */
-SC_VDEFINE int staging   = 0;      /* true if staging output */
+SC_VDEFINE int staging=0;                   /* true if staging output */
-SC_VDEFINE cell declared = 0;      /* number of local cells declared */
+SC_VDEFINE cell declared=0;                 /* number of local cells declared */
 SC_VDEFINE cell glb_declared=0;             /* number of global cells declared */
-SC_VDEFINE cell code_idx = 0;      /* number of bytes with generated code */
+SC_VDEFINE cell code_idx=0;                 /* number of bytes with generated code */
 SC_VDEFINE int ntv_funcid= 0;               /* incremental number of native function */
-SC_VDEFINE int errnum    = 0;      /* number of errors */
+SC_VDEFINE int errnum=0;                    /* number of errors */
-SC_VDEFINE int warnnum   = 0;      /* number of warnings */
+SC_VDEFINE int warnnum=0;                   /* number of warnings */
-SC_VDEFINE int sc_debug  = sCHKBOUNDS; /* by default: bounds checking+assertions */
+SC_VDEFINE int sc_debug=sCHKBOUNDS;         /* by default: bounds checking+assertions */
 SC_VDEFINE int sc_packstr= FALSE;           /* strings are packed by default? */
 SC_VDEFINE int sc_asmfile= FALSE;           /* create .ASM file? */
 SC_VDEFINE int sc_listing= FALSE;           /* create .LST file? */
 SC_VDEFINE int sc_compress=TRUE;            /* compress bytecode? */
-SC_VDEFINE int sc_needsemicolon=TRUE;/* semicolon required to terminate expressions? */
+SC_VDEFINE int sc_needsemicolon=TRUE;       /* semicolon required to terminate expressions? */
-SC_VDEFINE int sc_dataalign=sizeof(cell);/* data alignment value */
+SC_VDEFINE int sc_dataalign=sizeof(cell);   /* data alignment value */
 SC_VDEFINE int sc_alignnext=FALSE;          /* must frame of the next function be aligned? */
 SC_VDEFINE int pc_docexpr=FALSE;            /* must expression be attached to documentation comment? */
-SC_VDEFINE int curseg    = 0;      /* 1 if currently parsing CODE, 2 if parsing DATA */
+SC_VDEFINE int curseg=0;                    /* 1 if currently parsing CODE, 2 if parsing DATA */
-SC_VDEFINE cell pc_stksize=sDEF_AMXSTACK;/* default stack size */
+SC_VDEFINE cell pc_stksize=sDEF_AMXSTACK;   /* default stack size */
 SC_VDEFINE cell pc_amxlimit=0;              /* default abstract machine size limit = none */
 SC_VDEFINE cell pc_amxram=0;                /* default abstract machine data size limit = none */
-SC_VDEFINE int freading  = FALSE;  /* Is there an input file ready for reading? */
+SC_VDEFINE int freading=FALSE;              /* Is there an input file ready for reading? */
-SC_VDEFINE int fline     = 0;      /* the line number in the current file */
+SC_VDEFINE int fline=0;                     /* the line number in the current file */
-SC_VDEFINE short fnumber = 0;      /* the file number in the file table (debugging) */
+SC_VDEFINE symbol *line_sym=NULL;           /* the line number constant (__line) */
-SC_VDEFINE short fcurrent= 0;      /* current file being processed (debugging) */
+SC_VDEFINE short fnumber=0;                 /* the file number in the file table (debugging) */
+SC_VDEFINE short fcurrent=0;                /* current file being processed (debugging) */
 SC_VDEFINE short sc_intest=FALSE;           /* true if inside a test */
 SC_VDEFINE int pc_sideeffect=0;             /* true if an expression causes a side-effect */
-SC_VDEFINE int stmtindent= 0;      /* current indent of the statement */
+SC_VDEFINE int stmtindent=0;                /* current indent of the statement */
-SC_VDEFINE int indent_nowarn=FALSE;/* skip warning "217 loose indentation" */
+SC_VDEFINE int indent_nowarn=FALSE;         /* skip warning "217 loose indentation" */
 SC_VDEFINE int sc_tabsize=8;                /* number of spaces that a TAB represents */
 SC_VDEFINE short sc_allowtags=TRUE;         /* allow/detect tagnames in lex() */
 SC_VDEFINE int sc_status;                   /* read/write status */
@@ -88,7 +88,7 @@ SC_VDEFINE int sc_rationaltag=0;   /* tag for rational numbers */
 SC_VDEFINE int rational_digits=0;           /* number of fractional digits */
 SC_VDEFINE int sc_allowproccall=0;          /* allow/detect tagnames in lex() */
 SC_VDEFINE short sc_is_utf8=FALSE;          /* is this source file in UTF-8 encoding */
-SC_VDEFINE char *pc_deprecate=NULL;/* if non-null, mark next declaration as deprecated */
+SC_VDEFINE char *pc_deprecate=NULL;         /* if non-null, mark next declaration as deprecated */
 SC_VDEFINE int sc_curstates=0;              /* ID of the current state list */
 SC_VDEFINE int pc_optimize=sOPTIMIZE_NOMACRO; /* (peephole) optimization level */
 SC_VDEFINE int pc_memflags=0;               /* special flags for the stack/heap usage */