Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Scripting engine: 

Allow global variable declarations to be mixed with trigger and event/function declaration. This allows us to #include script files which variable/event declaration.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4667 4a71c877-e1ca-e34f-864e-861f7616d084
master
Roman C 2008-04-17 15:59:43 +00:00
parent f89e3bf1a6
commit 4c5d34f22b
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lib/script/script_parser.y
View File

@ -1943,13 +1943,11 @@ static void scriptStoreVarTypes(VAR_SYMBOL *psVar)
%%
script: header var_list
{
/* stop parsing here if we are just getting */
/* the variables in the script */
/* YYACCEPT */
}
trigger_list event_list
/*
The final accepting rule, must always be the first
rule, if not explicitly defined as accepting rule
*/
accept_script: script
{
unsigned int i;
SDWORD size = 0, debug_i = 0, totalArraySize = 0;
@ -1960,7 +1958,7 @@ script: header var_list
EVENT_SYMBOL *psEvent;
UDWORD numVars;
RULE("script: header var_list");
RULE("script: var_list");
// Calculate the code size
for(psTrig = psTriggers; psTrig; psTrig = psTrig->psNext)
@ -2178,29 +2176,27 @@ script: header var_list
base += arraySize;
}
RULE("END script: header var_list");
RULE("END script: var_list");
}
;
/**************************************************************************************
*
* Header declarations
*/
header: /* NULL token */
| header_decl
| header header_decl
;
header_decl: LINK TYPE ';'
{
// if (!scriptAddVariable("owner", $2, ST_PUBLIC, 0))
// {
// Out of memory - error already given
// YYABORT;
// }
}
;
script: var_list trigger_list
{
RULE("script:var_list trigger_list");
}
| script event_list
{
RULE("script:script event_list");
}
| script var_list
{
RULE("script:script var_list");
}
| script trigger_list
{
RULE("script:script trigger_list");
}
;
var_list: /* NULL token */
{