diff options
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/pythoncore.vcxproj | 21 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcxproj.filters | 21 | ||||
| -rw-r--r-- | PCbuild/regen.vcxproj | 17 |
3 files changed, 9 insertions, 50 deletions
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 8d5f99f833..2653ce9111 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -279,10 +279,9 @@ <ClInclude Include="..\Objects\stringlib\replace.h" /> <ClInclude Include="..\Objects\stringlib\split.h" /> <ClInclude Include="..\Objects\unicodetype_db.h" /> - <ClInclude Include="..\Parser\parser.h" /> <ClInclude Include="..\Parser\tokenizer.h" /> - <ClInclude Include="..\Parser\pegen\parse_string.h" /> - <ClInclude Include="..\Parser\pegen\pegen.h" /> + <ClInclude Include="..\Parser\string_parser.h" /> + <ClInclude Include="..\Parser\pegen.h" /> <ClInclude Include="..\PC\errmap.h" /> <ClInclude Include="..\PC\pyconfig.h" /> <ClInclude Include="..\Python\ceval_gil.h" /> @@ -343,8 +342,6 @@ <ClCompile Include="..\Modules\mmapmodule.c" /> <ClCompile Include="..\Modules\_opcode.c" /> <ClCompile Include="..\Modules\_operator.c" /> - <ClCompile Include="..\Modules\parsermodule.c" /> - <ClCompile Include="..\Modules\_peg_parser.c" /> <ClCompile Include="..\Modules\posixmodule.c" /> <ClCompile Include="..\Modules\rotatingtree.c" /> <ClCompile Include="..\Modules\sha1module.c" /> @@ -417,19 +414,13 @@ <ClCompile Include="..\Objects\unicodectype.c" /> <ClCompile Include="..\Objects\unicodeobject.c" /> <ClCompile Include="..\Objects\weakrefobject.c" /> - <ClCompile Include="..\Parser\acceler.c" /> - <ClCompile Include="..\Parser\grammar1.c" /> - <ClCompile Include="..\Parser\listnode.c" /> <ClCompile Include="..\Parser\myreadline.c" /> - <ClCompile Include="..\Parser\node.c" /> - <ClCompile Include="..\Parser\parser.c" /> - <ClCompile Include="..\Parser\parsetok.c" /> <ClCompile Include="..\Parser\tokenizer.c" /> <ClCompile Include="..\Parser\token.c" /> - <ClCompile Include="..\Parser\pegen\pegen.c" /> - <ClCompile Include="..\Parser\pegen\parse.c" /> - <ClCompile Include="..\Parser\pegen\parse_string.c" /> - <ClCompile Include="..\Parser\pegen\peg_api.c" /> + <ClCompile Include="..\Parser\pegen.c" /> + <ClCompile Include="..\Parser\parser.c" /> + <ClCompile Include="..\Parser\string_parser.c" /> + <ClCompile Include="..\Parser\peg_api.c" /> <ClCompile Include="..\PC\invalid_parameter_handler.c" /> <ClCompile Include="..\PC\winreg.c" /> <ClCompile Include="..\PC\config.c" /> diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters index 7bc9f8f166..6ea7afaa03 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -522,9 +522,6 @@ <ClInclude Include="..\Objects\unicodetype_db.h"> <Filter>Objects</Filter> </ClInclude> - <ClInclude Include="..\Parser\parser.h"> - <Filter>Parser</Filter> - </ClInclude> <ClInclude Include="..\Parser\tokenizer.h"> <Filter>Parser</Filter> </ClInclude> @@ -908,12 +905,6 @@ <ClCompile Include="..\Objects\weakrefobject.c"> <Filter>Objects</Filter> </ClCompile> - <ClCompile Include="..\Parser\acceler.c"> - <Filter>Parser</Filter> - </ClCompile> - <ClCompile Include="..\Parser\grammar1.c"> - <Filter>Parser</Filter> - </ClCompile> <ClCompile Include="..\Parser\pegen\pegen.c"> <Filter>Parser</Filter> </ClCompile> @@ -926,21 +917,9 @@ <ClCompile Include="..\Parser\pegen\peg_api.c"> <Filter>Parser</Filter> </ClCompile> - <ClCompile Include="..\Parser\listnode.c"> - <Filter>Parser</Filter> - </ClCompile> <ClCompile Include="..\Parser\myreadline.c"> <Filter>Parser</Filter> </ClCompile> - <ClCompile Include="..\Parser\node.c"> - <Filter>Parser</Filter> - </ClCompile> - <ClCompile Include="..\Parser\parser.c"> - <Filter>Parser</Filter> - </ClCompile> - <ClCompile Include="..\Parser\parsetok.c"> - <Filter>Parser</Filter> - </ClCompile> <ClCompile Include="..\Parser\tokenizer.c"> <Filter>Parser</Filter> </ClCompile> diff --git a/PCbuild/regen.vcxproj b/PCbuild/regen.vcxproj index 564a4dd711..ea246ffc8f 100644 --- a/PCbuild/regen.vcxproj +++ b/PCbuild/regen.vcxproj @@ -155,22 +155,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> - <Target Name="_RegenGrammar" BeforeTargets="Build"> - <!-- Regenerate Include/graminit.h and Python/graminit.c from Grammar/Grammar using pgen--> - <Exec Command=""$(PythonExe)" -m Parser.pgen "$(PySourcePath)Grammar\Grammar" "$(PySourcePath)Grammar\Tokens" "$(IntDir)graminit.h" "$(IntDir)graminit.c"" /> - <Copy SourceFiles="$(IntDir)graminit.h" DestinationFiles="$(PySourcePath)Include\graminit.h"> - <Output TaskParameter="CopiedFiles" ItemName="_UpdatedH" /> - </Copy> - <Copy SourceFiles="$(IntDir)graminit.c" DestinationFiles="$(PySourcePath)Python\graminit.c"> - <Output TaskParameter="CopiedFiles" ItemName="_UpdatedC" /> - </Copy> - <Warning Text="Grammar updated. You will need to rebuild pythoncore to see the changes." Condition="'@(_UpdatedH)' != '' and '@(_UpdatedC)' != ''" /> - </Target> <Target Name="_RegenPegen" BeforeTargets="Build"> - <!-- Regenerate Parser/pegen/parse.c --> + <!-- Regenerate Parser/parser.c --> <SetEnv Name="PYTHONPATH" Prefix="true" Value="$(PySourcePath)Tools\peg_generator\" /> - <Exec Command=""$(PythonExe)" -m pegen -q c "$(PySourcePath)Grammar\python.gram" "$(PySourcePath)Grammar\Tokens" -o "$(IntDir)parse.c"" /> - <Copy SourceFiles="$(IntDir)parse.c" DestinationFiles="$(PySourcePath)Parser\pegen\parse.c"> + <Exec Command=""$(PythonExe)" -m pegen -q c "$(PySourcePath)Grammar\python.gram" "$(PySourcePath)Grammar\Tokens" -o "$(IntDir)parser.c"" /> + <Copy SourceFiles="$(IntDir)parser.c" DestinationFiles="$(PySourcePath)Parser\parser.c"> <Output TaskParameter="CopiedFiles" ItemName="_UpdatedParse" /> </Copy> <Warning Text="Pegen updated. You will need to rebuild pythoncore to see the changes." Condition="'@(_UpdatedParse)' != ''" /> |