Updates for the red headed stepsister.

Refs Warzone2100#2936.
mikevdg · Nov 8, 2011 · de28a73 · de28a73
1 parent 3be85b0
commit de28a73
Show file tree

Hide file tree

Showing 18 changed files with 203 additions and 151 deletions.
diff --git a/.gitignore b/.gitignore
@@ -78,8 +78,8 @@ win32/__BUILD_CONFIG.USER
 # Autogenerated files:
 *.lex.[ch]
 *.tab.[ch]
-*.lex.[ch]pp
-*.tab.[ch]pp
+*lexer.[ch]pp
+*parser.[ch]pp
 /src/autorevision.h
 *.moc.h
 

diff --git a/lib/framework/framework.vcxproj b/lib/framework/framework.vcxproj
@@ -106,11 +106,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='STLport-Debug|Win32'">
     <FlexGenerator>
-      <OutputFile>%(Filename).lex.cpp</OutputFile>
+      <OutputFile>%(Filename).cpp</OutputFile>
     </FlexGenerator>
     <BisonParser>
       <Defines>true</Defines>
-      <OutputFile>%(Filename).tab.cpp</OutputFile>
+      <OutputFile>%(Filename).cpp</OutputFile>
     </BisonParser>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -178,7 +178,7 @@
     <ClCompile Include="geometry.cpp" />
     <ClCompile Include="i18n.cpp" />
     <ClCompile Include="lexer_input.cpp" />
-    <ClCompile Include="resource_lexer.lex.cpp">
+    <ClCompile Include="resource_lexer.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='STLport-Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
       <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
@@ -188,24 +188,16 @@
       <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
       <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='STLport-Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
     </ClCompile>
-    <ClCompile Include="resource_parser.tab.cpp" />
+    <ClCompile Include="resource_parser.cpp" />
     <ClCompile Include="stdio_ext.cpp" />
     <ClCompile Include="strres.cpp" />
-    <ClCompile Include="strres_lexer.lex.cpp" />
-    <ClCompile Include="strres_parser.tab.cpp" />
+    <ClCompile Include="strres_lexer.cpp" />
+    <ClCompile Include="strres_parser.cpp" />
     <ClCompile Include="treap.cpp" />
     <ClCompile Include="trig.cpp" />
     <ClCompile Include="utf.cpp" />
     <ClCompile Include="wzapp.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <FlexGenerator Include="resource_lexer.l" />
-    <FlexGenerator Include="strres_lexer.l" />
-  </ItemGroup>
-  <ItemGroup>
-    <BisonParser Include="resource_parser.y" />
-    <BisonParser Include="strres_parser.y" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\exceptionhandler\exceptionhandler.vcxproj">
       <Project>{9dc871e4-d58d-4af6-85a6-7df7a39b8c18}</Project>
@@ -248,6 +240,20 @@
     <ClInclude Include="wzfs.h" />
     <ClInclude Include="wzglobal.h" />
   </ItemGroup>
+  <ItemGroup>
+    <FlexGenerator Include="resource_lexer.lpp">
+      <FileType>Document</FileType>
+    </FlexGenerator>
+    <BisonParser Include="resource_parser.ypp">
+      <FileType>Document</FileType>
+    </BisonParser>
+    <FlexGenerator Include="strres_lexer.lpp">
+      <FileType>Document</FileType>
+    </FlexGenerator>
+    <BisonParser Include="strres_parser.ypp">
+      <FileType>Document</FileType>
+    </BisonParser>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\..\devpkg\FlexBison.targets" />

diff --git a/lib/framework/framework.vcxproj.filters b/lib/framework/framework.vcxproj.filters
@@ -32,56 +32,40 @@
     <ClCompile Include="lexer_input.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="resource_lexer.lex.cpp">
+    <ClCompile Include="stdio_ext.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="resource_parser.tab.cpp">
+    <ClCompile Include="strres.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="stdio_ext.cpp">
+    <ClCompile Include="treap.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="strres.cpp">
+    <ClCompile Include="trig.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="strres_lexer.lex.cpp">
+    <ClCompile Include="utf.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="strres_parser.tab.cpp">
+    <ClCompile Include="wzapp.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="treap.cpp">
+    <ClCompile Include="geometry.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="trig.cpp">
+    <ClCompile Include="resource_lexer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="utf.cpp">
+    <ClCompile Include="resource_parser.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="wzapp.cpp">
+    <ClCompile Include="strres_lexer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="geometry.cpp">
+    <ClCompile Include="strres_parser.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <FlexGenerator Include="resource_lexer.l">
-      <Filter>FlexBison</Filter>
-    </FlexGenerator>
-    <FlexGenerator Include="strres_lexer.l">
-      <Filter>FlexBison</Filter>
-    </FlexGenerator>
-  </ItemGroup>
-  <ItemGroup>
-    <BisonParser Include="resource_parser.y">
-      <Filter>FlexBison</Filter>
-    </BisonParser>
-    <BisonParser Include="strres_parser.y">
-      <Filter>FlexBison</Filter>
-    </BisonParser>
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="crc.h">
       <Filter>Header Files</Filter>
@@ -186,4 +170,20 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <FlexGenerator Include="resource_lexer.lpp">
+      <Filter>FlexBison</Filter>
+    </FlexGenerator>
+    <FlexGenerator Include="strres_lexer.lpp">
+      <Filter>FlexBison</Filter>
+    </FlexGenerator>
+  </ItemGroup>
+  <ItemGroup>
+    <BisonParser Include="resource_parser.ypp">
+      <Filter>FlexBison</Filter>
+    </BisonParser>
+    <BisonParser Include="strres_parser.ypp">
+      <Filter>FlexBison</Filter>
+    </BisonParser>
+  </ItemGroup>
 </Project>
diff --git a/lib/framework/resource_lexer.lpp b/lib/framework/resource_lexer.lpp
@@ -28,8 +28,11 @@
 #include "lib/framework/resly.h"
 
 /* Get the Yacc definitions */
+#if defined (WZ_CC_MSVC)
+#include "resource_parser.hpp"
+#else
 #include "resource_parser.h"
-
+#endif
 extern void res_error(const char* msg);
 
 #include "lib/framework/lexer_input.h"

diff --git a/lib/framework/strres_lexer.lpp b/lib/framework/strres_lexer.lpp
@@ -34,8 +34,11 @@
 #include <physfs.h>
 
 /* Get the Yacc definitions */
+#if defined (WZ_CC_MSVC)
+#include "strres_parser.hpp"
+#else
 #include "strres_parser.h"
-
+#endif
 #include "lib/framework/lexer_input.h"
 
 // fwrite declared with warn_unused_result, resulting in mysterious errors in "%%" on some distros.

diff --git a/lib/gamelib/audp_lexer.lpp b/lib/gamelib/audp_lexer.lpp
@@ -26,8 +26,12 @@
 
 #include "lib/gamelib/parser.h"
 
+#if defined (WZ_CC_MSVC)
+#include "audp_parser.hpp"
+#else
 /* Get the Yacc definitions */
 #include "audp_parser.h"
+#endif
 
 // fwrite declared with warn_unused_result, resulting in mysterious errors in "%%" on some distros.
 static inline bool no_warn_unused_result(int ignore) { if (ignore) {} return true; }

diff --git a/lib/gamelib/gamelib.vcxproj b/lib/gamelib/gamelib.vcxproj
@@ -100,11 +100,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='STLport-Debug|Win32'">
     <FlexGenerator>
-      <OutputFile>%(Filename).lex.cpp</OutputFile>
+      <OutputFile>%(Filename).cpp</OutputFile>
     </FlexGenerator>
     <BisonParser>
       <Defines>true</Defines>
-      <OutputFile>%(Filename).tab.cpp</OutputFile>
+      <OutputFile>%(Filename).cpp</OutputFile>
     </BisonParser>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -155,8 +155,8 @@
   <ItemGroup>
     <ClCompile Include="anim.cpp" />
     <ClCompile Include="animobj.cpp" />
-    <ClCompile Include="audp_lexer.lex.cpp" />
-    <ClCompile Include="audp_parser.tab.cpp" />
+    <ClCompile Include="audp_lexer.cpp" />
+    <ClCompile Include="audp_parser.cpp" />
     <ClCompile Include="gtime.cpp" />
     <ClCompile Include="hashtable.cpp" />
   </ItemGroup>
@@ -169,10 +169,12 @@
     <ClInclude Include="parser.h" />
   </ItemGroup>
   <ItemGroup>
-    <FlexGenerator Include="audp_lexer.l" />
-  </ItemGroup>
-  <ItemGroup>
-    <BisonParser Include="audp_parser.y" />
+    <FlexGenerator Include="audp_lexer.lpp">
+      <FileType>Document</FileType>
+    </FlexGenerator>
+    <BisonParser Include="audp_parser.ypp">
+      <FileType>Document</FileType>
+    </BisonParser>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/lib/gamelib/gamelib.vcxproj.filters b/lib/gamelib/gamelib.vcxproj.filters
@@ -20,16 +20,16 @@
     <ClCompile Include="animobj.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="audp_lexer.lex.cpp">
+    <ClCompile Include="gtime.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="audp_parser.tab.cpp">
+    <ClCompile Include="hashtable.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="gtime.cpp">
+    <ClCompile Include="audp_parser.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="hashtable.cpp">
+    <ClCompile Include="audp_lexer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -54,13 +54,13 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <FlexGenerator Include="audp_lexer.l">
+    <BisonParser Include="audp_parser.ypp">
       <Filter>FlexBison</Filter>
-    </FlexGenerator>
+    </BisonParser>
   </ItemGroup>
   <ItemGroup>
-    <BisonParser Include="audp_parser.y">
+    <FlexGenerator Include="audp_lexer.lpp">
       <Filter>FlexBison</Filter>
-    </BisonParser>
+    </FlexGenerator>
   </ItemGroup>
 </Project>
diff --git a/lib/script/chat_lexer.lpp b/lib/script/chat_lexer.lpp
@@ -32,7 +32,11 @@
 #include "lib/script/chat_processing.h"
 
 /* Get the Yacc definitions */
+#if defined (WZ_CC_MSVC)
+#include "chat_parser.hpp"
+#else
 #include "chat_parser.h"
+#endif
 
 // fwrite declared with warn_unused_result, resulting in mysterious errors in "%%" on some distros.
 static inline bool no_warn_unused_result(int ignore) { if (ignore) {} return true; }

diff --git a/lib/script/script.vcxproj b/lib/script/script.vcxproj
@@ -100,11 +100,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='STLport-Debug|Win32'">
     <FlexGenerator>
-      <OutputFile>%(Filename).lex.cpp</OutputFile>
+      <OutputFile>%(Filename).cpp</OutputFile>
     </FlexGenerator>
     <BisonParser>
       <Defines>true</Defines>
-      <OutputFile>%(Filename).tab.cpp</OutputFile>
+      <OutputFile>%(Filename).cpp</OutputFile>
     </BisonParser>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -153,15 +153,15 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="chat_lexer.lex.cpp" />
-    <ClCompile Include="chat_parser.tab.cpp" />
+    <ClCompile Include="chat_lexer.cpp" />
+    <ClCompile Include="chat_parser.cpp" />
     <ClCompile Include="codeprint.cpp" />
     <ClCompile Include="event.cpp" />
     <ClCompile Include="eventsave.cpp" />
     <ClCompile Include="interpreter.cpp" />
     <ClCompile Include="script.cpp" />
-    <ClCompile Include="script_lexer.lex.cpp" />
-    <ClCompile Include="script_parser.tab.cpp" />
+    <ClCompile Include="script_lexer.cpp" />
+    <ClCompile Include="script_parser.cpp" />
     <ClCompile Include="stack.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -177,12 +177,18 @@
     <ClInclude Include="stack.h" />
   </ItemGroup>
   <ItemGroup>
-    <FlexGenerator Include="chat_lexer.l" />
-    <FlexGenerator Include="script_lexer.l" />
-  </ItemGroup>
-  <ItemGroup>
-    <BisonParser Include="chat_parser.y" />
-    <BisonParser Include="script_parser.y" />
+    <FlexGenerator Include="chat_lexer.lpp">
+      <FileType>Document</FileType>
+    </FlexGenerator>
+    <BisonParser Include="chat_parser.ypp">
+      <FileType>Document</FileType>
+    </BisonParser>
+    <FlexGenerator Include="script_lexer.lpp">
+      <FileType>Document</FileType>
+    </FlexGenerator>
+    <BisonParser Include="script_parser.ypp">
+      <FileType>Document</FileType>
+    </BisonParser>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">