fallout2sfall/sslc
0
0
Fork 0
mirror of https://github.com/sfall-team/sslc.git synced 2026-07-27 16:52:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added ability to declare local variables anywhere in the procedure body

Browse Source 
Updated version number.
This commit is contained in:
NovaRain
2020-07-20 11:23:09 +08:00
parent a1d4d7f226
commit 6872983d58
5 changed files with 53 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compile.c
+1 -1
View File
@@ -36,7 +36,7 @@ FILE *parseroutput;
#endif
static void PrintLogo() {
parseOutput("Startreck scripting language compiler (Fallout 2 sfall edition 4.2.3)\n\n"
parseOutput("Startreck scripting language compiler (Fallout 2 sfall edition 4.2.7)\n\n"
#ifndef WIN2K
"Preprocessing handled by mcpp 2.7.2\n"
"Copyright (c) 1998, 2002-2008 Kiyoshi Matsui <kmatsui@t3.rim.or.jp>\n"
parse.c
+44 -23
View File
@@ -572,19 +572,19 @@ static int defineVariable(VariableList *v, char **namelist, int type, ArrayVarLi
if (i == -1)
parseSemanticError("Couldn't add variable %s.", lexData.stringData);
if(expectToken('[') != -1) {
if(!arrays) parseSemanticError("Array variable declarations not allowed here");
av.name=lexData.stringData;
av.datasize=4;
if (expectToken(T_CONSTANT) == -1) parseError("Initialization of array bounds with non-constant");
if (lexData.type!=T_INT) parseError("Initialization of array bounds with non-integer");
av.len=lexData.intData;
if(expectToken(',')!=-1) {
if (expectToken(T_CONSTANT) == -1) parseError("Initialization of array data size with non-constant");
if (lexData.type!=T_INT) parseError("Initialization of array data size with non-integer");
av.datasize=lexData.intData;
if (expectToken('[') != -1) {
if (!arrays) parseSemanticError("Array variable declarations not allowed here.");
av.name = lexData.stringData;
av.datasize = 4;
if (expectToken(T_CONSTANT) == -1) parseError("Initialization of array bounds with non-constant.");
if (lexData.type != T_INT) parseError("Initialization of array bounds with non-integer.");
av.len = lexData.intData;
if (expectToken(',') != -1) {
if (expectToken(T_CONSTANT) == -1) parseError("Initialization of array data size with non-constant.");
if (lexData.type != T_INT) parseError("Initialization of array data size with non-integer.");
av.datasize = lexData.intData;
}
if(expectToken(']')==-1) parseError("Expected ']'");
if (expectToken(']') == -1) parseError("Expected ']'");
AddArrayVar(arrays, &av);
} else if (expectToken(T_ASSIGN) != -1) {
char buf[1024];
@@ -606,9 +606,9 @@ static int defineVariable(VariableList *v, char **namelist, int type, ArrayVarLi
} else
assignVariable(v, i, &lexData);
}
} while(allowMulti && expectToken(',') != -1);
} while (allowMulti && expectToken(',') != -1);
if (expectToken(';') == -1) {
if(arrays && backwardcompat == 0) parseError("Expected ';' at end of variable declaration");
if (arrays && backwardcompat == 0) parseError("Expected ';' at end of variable declaration.");
}
return 0;
}
@@ -871,23 +871,40 @@ static void copyVariables(VariableList *to, char **toNames, VariableList *from,
}
}
/* Parse the syntax for declaring global and local variables of the procedures */
static int variable(VariableList *v, char **names, int type, ArrayVarList* arrays, int allowMulti) {
if (expectToken(T_VARIABLE) == -1) return 1;
do {
if (expectToken(T_BEGIN) != -1) { // sfall addition
while(expectToken(T_END) == -1) {
while (expectToken(T_END) == -1) {
if (defineVariable(v, names, type, arrays, allowMulti))
return 1;
}
}
else if (expectToken(T_SYMBOL) != -1) {
} else if (expectToken(T_SYMBOL) != -1) {
ungetToken();
if (defineVariable(v, names, type, arrays, allowMulti))
return 1;
}
else parseError("Expected symbol or 'begin' block");
} while(expectToken(T_VARIABLE) != -1);
} else
parseError("Expected symbol or 'begin' block.");
} while (expectToken(T_VARIABLE) != -1);
ungetToken(); // put back what was there
return 0;
}
/*
Parse the syntax for declaring local variables in the procedure body without the 'begin...end' block
added sfall 4.2.7
*/
static int VariableParse(VariableList *v, char **names, int type, ArrayVarList* arrays) {
do {
if (expectToken(T_SYMBOL) != -1) {
ungetToken();
if (defineVariable(v, names, type, arrays, 1)) return 1;
} else
parseError("Expected symbol.");
} while (expectToken(T_VARIABLE) != -1);
ungetToken(); // put back what was there
return 0;
@@ -965,7 +982,7 @@ void emitNode(Procedure *p, NodeList *n, LexData *data) {
n->nodes[i].value.type = type;
n->nodes[i].value.intData = v;
break;
}
}
}
}
@@ -1635,8 +1652,12 @@ static void parseBlock(Procedure *p) {
while((i = lex()) != T_END) {
if (i == T_EOF)
parseError("Premature EOF encountered.");
ungetToken();
parseStatement(p);
else if (i == T_VARIABLE) { // sfall addition (Fakels)
VariableParse(&p->variables, &p->namelist, V_LOCAL, &arrays);
} else {
ungetToken();
parseStatement(p);
}
}
emitNode(p, &p->nodes, &lexData); // emit the end
resource.h
+2 -2
View File
@@ -6,10 +6,10 @@
#define VERSION_MAJOR 4
#define VERSION_MINOR 2
#define VERSION_BUILD 4
#define VERSION_BUILD 7
#define VERSION_REV 0
#define VERSION_STRING "4.2.4"
#define VERSION_STRING "4.2.7"
#ifdef BUILDING_DLL
#define FILE_STRING "parser.dll"
sslc.vcxproj
+3 -3
View File
@@ -325,9 +325,9 @@
<ItemGroup>
<ClInclude Include="extra.h" />
<ClInclude Include="gencode.h" />
<ClInclude Include="internal.H" />
<ClInclude Include="internal.h" />
<ClInclude Include="lex.h" />
<ClInclude Include="noconfig.H" />
<ClInclude Include="noconfig.h" />
<ClInclude Include="opcodes.h" />
<ClInclude Include="opextra.h" />
<ClInclude Include="oplib.h" />
@@ -336,7 +336,7 @@
<ClInclude Include="parselib.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="sfalltok.h" />
<ClInclude Include="system.H" />
<ClInclude Include="system.h" />
<ClInclude Include="tokens.h" />
</ItemGroup>
<ItemGroup>
sslc.vcxproj.filters
+3 -3
View File
@@ -85,13 +85,13 @@
<ClInclude Include="tokens.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="internal.H">
<ClInclude Include="internal.h">
<Filter>Header Files\mcpp</Filter>
</ClInclude>
<ClInclude Include="noconfig.H">
<ClInclude Include="noconfig.h">
<Filter>Header Files\mcpp</Filter>
</ClInclude>
<ClInclude Include="system.H">
<ClInclude Include="system.h">
<Filter>Header Files\mcpp</Filter>
</ClInclude>
<ClInclude Include="gencode.h">