Recovered from cvs revision 2007-07-21 04:14:00

This commit is contained in:
2007-07-25 18:53:00 +00:00
parent f263c4f96f
commit 21550f9acf
24 changed files with 532 additions and 340 deletions

View File

@ -46,7 +46,7 @@
PreprocessorDefinitions="_DEBUG;WIN32"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
DisableLanguageExtensions="true"
WarningLevel="3"
SuppressStartupBanner="true"

View File

@ -117,7 +117,7 @@
PreprocessorDefinitions="_DEBUG;WIN32"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
DisableLanguageExtensions="true"
WarningLevel="3"
SuppressStartupBanner="true"

View File

@ -148,7 +148,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
PrecompiledHeaderFile=".\debug/aseawk_jni.pch"
AssemblerListingLocation=".\debug/"
ObjectFile=".\debug/"

View File

@ -1,5 +1,5 @@
/*
* $Id: parse.c,v 1.11 2007/06/29 11:36:45 bacon Exp $
* $Id: parse.c,v 1.12 2007/07/20 09:23:37 bacon Exp $
*
* {License}
*/
@ -582,6 +582,12 @@ static ase_awk_t* parse_progunit (ase_awk_t* awk)
}
else if (MATCH(awk,TOKEN_BEGIN))
{
if (awk->tree.begin != ASE_NULL)
{
SETERRLIN (awk, ASE_AWK_EDUPBEG, awk->token.prev.line);
return ASE_NULL;
}
awk->parse.id.block = PARSE_BEGIN;
if (get_token(awk) == -1) return ASE_NULL;
@ -605,6 +611,12 @@ static ase_awk_t* parse_progunit (ase_awk_t* awk)
}
else if (MATCH(awk,TOKEN_END))
{
if (awk->tree.end != ASE_NULL)
{
SETERRLIN (awk, ASE_AWK_EDUPEND, awk->token.prev.line);
return ASE_NULL;
}
awk->parse.id.block = PARSE_END;
if (get_token(awk) == -1) return ASE_NULL;