UNLOZE/sourcemod
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated to trunk code

Browse Source 
--HG--
branch : sourcemod-1.1.0
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.1.0%401936
This commit is contained in:
David Anderson
2008-03-13 17:04:25 +00:00
parent 50760d853f
commit a64894bbe4
7 changed files with 238 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sourcepawn/compiler/Makefile
+2 -2
View File
@@ -36,7 +36,7 @@ else
CPPFLAGS += $(OPT_CPP_FLAGS)
endif
CFLAGS += -DLINUX -DNDEBUG -DHAVE_STDINT_H -DAMX_ANSIONLY -DENABLE_BINRELOC
CFLAGS += -DLINUX -DNDEBUG -DHAVE_STDINT_H -DAMX_ANSIONLY -DENABLE_BINRELOC -m32
CPPFLAGS += -Wno-deprecated -fno-exceptions -fno-rtti
OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
@@ -53,7 +53,7 @@ all:
$(MAKE) spcomp
spcomp: $(OBJ_LINUX)
$(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -ldl -lm -o$(BIN_DIR)/$(BINARY)
$(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) $(OBJ_LINUX) $(LINK) -m32 -ldl -lm -o$(BIN_DIR)/$(BINARY)
debug:
$(MAKE) all DEBUG=true
sourcepawn/compiler/sc1.c
+2
View File
@@ -4136,6 +4136,8 @@ static int newfunc(char *firstname,int firsttag,int fpublic,int fstatic,int stoc
/* "declargs()" found the ")"; if a ";" appears after this, it was a
* prototype */
if (matchtoken(';')) {
if (sym->usage & uPUBLIC)
error(10);
sym->usage|=uFORWARD;
if (!sc_needsemicolon)
error(10); /* old style prototypes used with optional semicolumns */
sourcepawn/compiler/sc3.c
+7 -4
View File
@@ -1207,7 +1207,7 @@ static int hier14(value *lval1)
} /* if */
} /* if */
if (lval3.sym->dim.array.level!=level)
return error(48); /* array dimensions must match */
return error(47); /* array dimensions must match */
else if (ltlength<val || exactmatch && ltlength>val || val==0)
return error(47); /* array sizes must match */
else if (lval3.ident!=iARRAYCELL && !matchtag(lval3.sym->x.tags.index,idxtag,TRUE))
@@ -1217,6 +1217,7 @@ static int hier14(value *lval1)
symbol *sym1 = lval3.sym;
symbol *sym2 = lval2.sym;
int i;
error(23);
assert(sym1!=NULL && sym2!=NULL);
/* ^^^ sym2 must be valid, because only variables can be
* multi-dimensional (there are no multi-dimensional literals),
@@ -1328,7 +1329,9 @@ static int hier13(value *lval)
array1= (lval->ident==iARRAY || lval->ident==iREFARRAY);
array2= (lval2.ident==iARRAY || lval2.ident==iREFARRAY);
if (array1 && !array2) {
char *ptr=(lval->sym->name!=NULL) ? lval->sym->name : "-unknown-";
const char *ptr = "-unknown-";
if (lval->sym != NULL && lval->sym->name != NULL)
ptr = lval->sym->name;
error(33,ptr); /* array must be indexed */
} else if (!array1 && array2) {
char *ptr=(lval2.sym->name!=NULL) ? lval2.sym->name : "-unknown-";
@@ -1569,7 +1572,7 @@ static int hier2(value *lval)
if (level>sym->dim.array.level+1) {
error(28,sym->name); /* invalid subscript */
} else if (level==sym->dim.array.level+1) {
lval->constval= (idxsym!=NULL && idxsym->dim.array.length>0) ? idxsym->dim.array.length : 1;
lval->constval=(idxsym!=NULL && idxsym->dim.array.length>0) ? idxsym->dim.array.length : 1;
} else {
lval->constval=array_levelsize(sym,level);
}
@@ -2365,7 +2368,7 @@ static int nesting=0;
*/
} else {
arglist[argpos]=ARG_DONE; /* flag argument as "present" */
if (arg[argidx].numtags==1) /* set the expected tag, if any */
if (arg[argidx].ident!=0 && arg[argidx].numtags==1) /* set the expected tag, if any */
lval.cmptag=arg[argidx].tags[0];
lvalue=hier14(&lval);
assert(sc_status==statFIRST || arg[argidx].tags!=NULL);