Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed bug at18003 (Geesu)

Browse Source 
Fixed bug p1123149221 (Twilight Suzuka)
This commit is contained in:
David Anderson 2005-09-06 01:55:41 +00:00
parent 81ab33d794
commit a105bc7402
4 changed files with 59 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/libpc300/libpc300.sln
View File

@ -6,6 +6,7 @@ EndProject
Global Global
GlobalSection(SolutionConfiguration) = preSolution GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug Debug = Debug
Debug32 = Debug32
Release = Release Release = Release
Release32 = Release32 Release32 = Release32
Release64 = Release64 Release64 = Release64
@ -13,6 +14,8 @@ Global
GlobalSection(ProjectConfiguration) = postSolution GlobalSection(ProjectConfiguration) = postSolution
{19B72687-080B-437A-917A-12AEB0031635}.Debug.ActiveCfg = Release|Win32 {19B72687-080B-437A-917A-12AEB0031635}.Debug.ActiveCfg = Release|Win32
{19B72687-080B-437A-917A-12AEB0031635}.Debug.Build.0 = Release|Win32 {19B72687-080B-437A-917A-12AEB0031635}.Debug.Build.0 = Release|Win32
{19B72687-080B-437A-917A-12AEB0031635}.Debug32.ActiveCfg = Debug32|Win32
{19B72687-080B-437A-917A-12AEB0031635}.Debug32.Build.0 = Debug32|Win32
{19B72687-080B-437A-917A-12AEB0031635}.Release.ActiveCfg = Release|Win32 {19B72687-080B-437A-917A-12AEB0031635}.Release.ActiveCfg = Release|Win32
{19B72687-080B-437A-917A-12AEB0031635}.Release.Build.0 = Release|Win32 {19B72687-080B-437A-917A-12AEB0031635}.Release.Build.0 = Release|Win32
{19B72687-080B-437A-917A-12AEB0031635}.Release32.ActiveCfg = Release32|Win32 {19B72687-080B-437A-917A-12AEB0031635}.Release32.ActiveCfg = Release32|Win32

52
compiler/libpc300/libpc300.vcproj
View File

@ -200,6 +200,55 @@
<Tool <Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/> Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration> </Configuration>
<Configuration
Name="Debug32|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPC300_EXPORTS;PAWNC_DLL;PAWN_CELL_SIZE=32;NO_MAIN"
MinimalRebuild="TRUE"
BasicRuntimeChecks="1"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)/amxxpc32.dll"
LinkIncremental="2"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/libpc300.pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/libpc300.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations> </Configurations>
<References> <References>
</References> </References>
@ -247,9 +296,6 @@
<File <File
RelativePath=".\scstate.c"> RelativePath=".\scstate.c">
</File> </File>
<File
RelativePath=".\scstub.c">
</File>
<File <File
RelativePath=".\scvars.c"> RelativePath=".\scvars.c">
</File> </File>

2
compiler/libpc300/sc1.c
View File

@ -3178,7 +3178,7 @@ static int newfunc(char *firstname,int firsttag,int fpublic,int fstatic,int stoc
if ((sym->usage & (uPROTOTYPED | uREAD))==uREAD && sym->tag!=0) { if ((sym->usage & (uPROTOTYPED | uREAD))==uREAD && sym->tag!=0) {
int curstatus=sc_status; int curstatus=sc_status;
sc_status=statWRITE; /* temporarily set status to WRITE, so the warning isn't blocked */ sc_status=statWRITE; /* temporarily set status to WRITE, so the warning isn't blocked */
error(208); //error(208); //this is silly, it should be caught the first pass
sc_status=curstatus; sc_status=curstatus;
sc_reparse=TRUE; /* must add another pass to "initial scan" phase */ sc_reparse=TRUE; /* must add another pass to "initial scan" phase */
} /* if */ } /* if */

8
compiler/libpc300/sc3.c
View File

@ -964,8 +964,12 @@ static int hier14(value *lval1)
check_userop(NULL,lval2.tag,lval3.tag,2,&lval3,&lval2.tag); check_userop(NULL,lval2.tag,lval3.tag,2,&lval3,&lval2.tag);
store(&lval3); /* now, store the expression result */ store(&lval3); /* now, store the expression result */
} /* if */ } /* if */
if (!oper && !matchtag(lval3.tag,lval2.tag,TRUE)) if (!oper) { /* tagname mismatch (if "oper", warning already given in plunge2()) */
error(213); /* tagname mismatch (if "oper", warning already given in plunge2()) */ if (lval3.sym && !matchtag(lval3.sym->tag, lval2.tag, TRUE))
error(213);
else if (!lval3.sym && !matchtag(lval3.tag, lval2.tag, TRUE))
error(213);
}
if (lval3.sym) if (lval3.sym)
markusage(lval3.sym,uWRITTEN); markusage(lval3.sym,uWRITTEN);
sideeffect=TRUE; sideeffect=TRUE;