diff -r 8017e8df6a30 Include/bitset.h
--- a/Include/bitset.h Sun Mar 30 20:34:30 2014 -0400
+++ b/Include/bitset.h Sun Mar 30 22:30:18 2014 -0500
@@ -19,7 +19,7 @@
void mergebitset(bitset bs1, bitset bs2, int nbits);
#define BITSPERBYTE (8*sizeof(BYTE))
-#define NBYTES(nbits) (((nbits) + BITSPERBYTE - 1) / BITSPERBYTE)
+#define NBYTES(nbits) (int)(((nbits) + BITSPERBYTE - 1) / BITSPERBYTE)
#define BIT2BYTE(ibit) ((ibit) / BITSPERBYTE)
#define BIT2SHIFT(ibit) ((ibit) % BITSPERBYTE)
diff -r 8017e8df6a30 PCbuild/pcbuild.sln
--- a/PCbuild/pcbuild.sln Sun Mar 30 20:34:30 2014 -0400
+++ b/PCbuild/pcbuild.sln Sun Mar 30 22:30:18 2014 -0500
@@ -84,6 +84,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tix", "tix.vcxproj", "{C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pgen", "pgen.vcxproj", "{31E2EDA3-1654-4BA0-A446-455EE16237EA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -699,6 +701,14 @@
{C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.Release|Win32.Build.0 = Release|Win32
{C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.Release|x64.ActiveCfg = Release|x64
{C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.Release|x64.Build.0 = Release|x64
+ {31E2EDA3-1654-4BA0-A446-455EE16237EA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {31E2EDA3-1654-4BA0-A446-455EE16237EA}.Debug|x64.ActiveCfg = Debug|x64
+ {31E2EDA3-1654-4BA0-A446-455EE16237EA}.PGInstrument|Win32.ActiveCfg = Release|Win32
+ {31E2EDA3-1654-4BA0-A446-455EE16237EA}.PGInstrument|x64.ActiveCfg = Release|x64
+ {31E2EDA3-1654-4BA0-A446-455EE16237EA}.PGUpdate|Win32.ActiveCfg = Release|Win32
+ {31E2EDA3-1654-4BA0-A446-455EE16237EA}.PGUpdate|x64.ActiveCfg = Release|x64
+ {31E2EDA3-1654-4BA0-A446-455EE16237EA}.Release|Win32.ActiveCfg = Release|Win32
+ {31E2EDA3-1654-4BA0-A446-455EE16237EA}.Release|x64.ActiveCfg = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff -r 8017e8df6a30 PCbuild/pgen.vcxproj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/PCbuild/pgen.vcxproj Sun Mar 30 22:30:18 2014 -0500
@@ -0,0 +1,205 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {31E2EDA3-1654-4BA0-A446-455EE16237EA}
+ Win32Proj
+ pgen
+
+
+
+ Application
+ true
+ Unicode
+
+
+ Application
+ true
+ Unicode
+
+
+ Application
+ false
+ true
+ Unicode
+
+
+ Application
+ false
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;PGEN;Py_NO_ENABLE_SHARED;%(PreprocessorDefinitions)
+
+
+ Console
+ true
+
+
+ $(TargetPath) ..\Grammar\Grammar ..\Include\graminit.h ..\Python\graminit.c
+
+
+ generating grammar files...
+
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;PGEN;Py_NO_ENABLE_SHARED;%(PreprocessorDefinitions)
+
+
+ Console
+ true
+
+
+ $(TargetPath) ..\Grammar\Grammar ..\Include\graminit.h ..\Python\graminit.c
+
+
+ generating grammar files...
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;PGEN;Py_NO_ENABLE_SHARED;%(PreprocessorDefinitions)
+
+
+ Console
+ true
+ true
+ true
+
+
+ $(TargetPath) ..\Grammar\Grammar ..\Include\graminit.h ..\Python\graminit.c
+
+
+ generating grammar files...
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;PGEN;Py_NO_ENABLE_SHARED;%(PreprocessorDefinitions)
+
+
+ Console
+ true
+ true
+ true
+
+
+ $(TargetPath) ..\Grammar\Grammar ..\Include\graminit.h ..\Python\graminit.c
+
+
+ generating grammar files...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 8017e8df6a30 PCbuild/pgen.vcxproj.filters
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/PCbuild/pgen.vcxproj.filters Sun Mar 30 22:30:18 2014 -0500
@@ -0,0 +1,98 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hpp;hxx;hm;inl;inc;xsd
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
\ No newline at end of file
diff -r 8017e8df6a30 Parser/parsetok_pgen.c
--- a/Parser/parsetok_pgen.c Sun Mar 30 20:34:30 2014 -0400
+++ b/Parser/parsetok_pgen.c Sun Mar 30 22:30:18 2014 -0500
@@ -1,2 +1,4 @@
+#ifndef PGEN
#define PGEN
+#endif
#include "parsetok.c"
diff -r 8017e8df6a30 Parser/pgenmain.c
--- a/Parser/pgenmain.c Sun Mar 30 20:34:30 2014 -0400
+++ b/Parser/pgenmain.c Sun Mar 30 22:30:18 2014 -0500
@@ -13,7 +13,9 @@
- check for duplicate definitions of names (instead of fatal err)
*/
+#ifndef PGEN
#define PGEN
+#endif
#include "Python.h"
#include "pgenheaders.h"
@@ -101,7 +103,7 @@
i = strlen(err.text);
if (i == 0 || err.text[i-1] != '\n')
fprintf(stderr, "\n");
- for (i = 0; i < err.offset; i++) {
+ for (i = 0; (int)i < err.offset; i++) {
if (err.text[i] == '\t')
putc('\t', stderr);
else
diff -r 8017e8df6a30 Parser/printgrammar.c
--- a/Parser/printgrammar.c Sun Mar 30 20:34:30 2014 -0400
+++ b/Parser/printgrammar.c Sun Mar 30 22:30:18 2014 -0500
@@ -1,7 +1,9 @@
/* Print a bunch of C initializers that represent a grammar */
+#ifndef PGEN
#define PGEN
+#endif
#include "pgenheaders.h"
#include "grammar.h"
diff -r 8017e8df6a30 Parser/tokenizer_pgen.c
--- a/Parser/tokenizer_pgen.c Sun Mar 30 20:34:30 2014 -0400
+++ b/Parser/tokenizer_pgen.c Sun Mar 30 22:30:18 2014 -0500
@@ -1,2 +1,4 @@
+#ifndef PGEN
#define PGEN
+#endif
#include "tokenizer.c"