clara/lcc
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

lexing and parsing unary operators

Browse source
This commit is contained in:
Clemens-Dautermann 2020-08-20 17:11:43 +02:00
parent b2c2a2f497
commit 202c1d2ca2
21 changed files with 290 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Compiler/.idea/.idea.Compiler/.idea/contentModel.xml generated
View file

@ -29,8 +29,10 @@
<e p="FunctionNode.cs" t="Include" /> <e p="FunctionNode.cs" t="Include" />
<e p="Node.cs" t="Include" /> <e p="Node.cs" t="Include" />
<e p="NodeType.cs" t="Include" /> <e p="NodeType.cs" t="Include" />
<e p="OperatorType.cs" t="Include" />
<e p="ProgramNode.cs" t="Include" /> <e p="ProgramNode.cs" t="Include" />
<e p="ReturnNode.cs" t="Include" /> <e p="ReturnNode.cs" t="Include" />
<e p="UnaryOperatorNode.cs" t="Include" />
</e> </e>
<e p="Parser.cs" t="Include" /> <e p="Parser.cs" t="Include" />
</e> </e>

175
Compiler/.idea/.idea.Compiler/.idea/workspace.xml generated
View file

@ -20,33 +20,27 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="a54bb6de-191c-4bd1-91ab-3953adfc5dfb" name="Default Changelist" comment=""> <list default="true" id="a54bb6de-191c-4bd1-91ab-3953adfc5dfb" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/../stage_1/invalid/missing_paren.c" afterDir="false" /> <change afterPath="$PROJECT_DIR$/Parser/Nodes/OperatorType.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../stage_1/invalid/missing_retval.c" afterDir="false" /> <change afterPath="$PROJECT_DIR$/Parser/Nodes/UnaryOperatorNode.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../stage_1/invalid/no_brace.c" afterDir="false" /> <change afterPath="$PROJECT_DIR$/../stage_2/invalid/missing_const.c" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../stage_1/invalid/no_semicolon.c" afterDir="false" /> <change afterPath="$PROJECT_DIR$/../stage_2/invalid/missing_semicolon.c" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../stage_1/invalid/no_space.c" afterDir="false" /> <change afterPath="$PROJECT_DIR$/../stage_2/invalid/nested_missing_const.c" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../stage_1/invalid/wrong_case.c" afterDir="false" /> <change afterPath="$PROJECT_DIR$/../stage_2/invalid/wrong_order.c" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../stage_1/valid/multi_digit.c" afterDir="false" /> <change afterPath="$PROJECT_DIR$/../stage_2/valid/bitwise.c" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../stage_1/valid/newlines.c" afterDir="false" /> <change afterPath="$PROJECT_DIR$/../stage_2/valid/bitwise_zero.c" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../stage_1/valid/no_newlines.c" afterDir="false" /> <change afterPath="$PROJECT_DIR$/../stage_2/valid/neg.c" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../stage_1/valid/return_0.c" afterDir="false" /> <change afterPath="$PROJECT_DIR$/../stage_2/valid/nested_ops.c" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../stage_1/valid/return_2.c" afterDir="false" /> <change afterPath="$PROJECT_DIR$/../stage_2/valid/nested_ops_2.c" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../stage_1/valid/spaces.c" afterDir="false" /> <change afterPath="$PROJECT_DIR$/../stage_2/valid/not_five.c" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../test_compiler.sh" afterDir="false" /> <change afterPath="$PROJECT_DIR$/../stage_2/valid/not_zero.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.Compiler/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Compiler/.idea/contentModel.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.Compiler/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Compiler/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/.idea.Compiler/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Compiler/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Compiler.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Compiler.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Compiler.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Compiler.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../tests/week_1/invalid/missing_paren.c" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/Lexer/Lexer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Lexer/Lexer.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../tests/week_1/invalid/missing_retval.c" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/Lexer/TokenType.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Lexer/TokenType.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../tests/week_1/invalid/no_brace.c" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/Parser/Nodes/NodeType.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Parser/Nodes/NodeType.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../tests/week_1/invalid/no_semicolon.c" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/Parser/Parser.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Parser/Parser.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../tests/week_1/invalid/no_space.c" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/../grammar" beforeDir="false" afterPath="$PROJECT_DIR$/../grammar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../tests/week_1/invalid/wrong_case.c" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../tests/week_1/valid/multi_digit.c" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../tests/week_1/valid/newlines.c" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../tests/week_1/valid/no_newlines.c" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../tests/week_1/valid/return_0.c" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../tests/week_1/valid/return_2.c" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../tests/week_1/valid/spaces.c" beforeDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -112,15 +106,19 @@
<option value="$PROJECT_DIR$/Parser/Exceptions/WrongTypeException.cs" /> <option value="$PROJECT_DIR$/Parser/Exceptions/WrongTypeException.cs" />
<option value="$PROJECT_DIR$/Lexer/Token.cs" /> <option value="$PROJECT_DIR$/Lexer/Token.cs" />
<option value="$PROJECT_DIR$/Parser/Nodes/Node.cs" /> <option value="$PROJECT_DIR$/Parser/Nodes/Node.cs" />
<option value="$PROJECT_DIR$/Lexer/Lexer.cs" />
<option value="$PROJECT_DIR$/Parser/Exceptions/MissingTokenException.cs" /> <option value="$PROJECT_DIR$/Parser/Exceptions/MissingTokenException.cs" />
<option value="$PROJECT_DIR$/Parser/Exceptions/UnexpectedTokenException.cs" /> <option value="$PROJECT_DIR$/Parser/Exceptions/UnexpectedTokenException.cs" />
<option value="$PROJECT_DIR$/Lexer/TokenType.cs" />
<option value="$PROJECT_DIR$/t.tt" /> <option value="$PROJECT_DIR$/t.tt" />
<option value="$PROJECT_DIR$/Parser/Nodes/NodeType.cs" />
<option value="$PROJECT_DIR$/Parser/Nodes/ReturnNode.cs" /> <option value="$PROJECT_DIR$/Parser/Nodes/ReturnNode.cs" />
<option value="$PROJECT_DIR$/Parser/Parser.cs" />
<option value="$PROJECT_DIR$/Generator/Generator.cs" /> <option value="$PROJECT_DIR$/Generator/Generator.cs" />
<option value="$PROJECT_DIR$/Lexer/TokenType.cs" />
<option value="$PROJECT_DIR$/Lexer/Lexer.cs" />
<option value="$PROJECT_DIR$/../grammar" />
<option value="$PROJECT_DIR$/Parser/Nodes/NodeType.cs" />
<option value="$PROJECT_DIR$/Parser/Nodes/OperatorTypes.cs" />
<option value="$PROJECT_DIR$/Parser/Nodes/OperatorType.cs" />
<option value="$PROJECT_DIR$/Parser/Nodes/UnaryOperatorNode.cs" />
<option value="$PROJECT_DIR$/Parser/Parser.cs" />
<option value="$PROJECT_DIR$/Compiler.cs" /> <option value="$PROJECT_DIR$/Compiler.cs" />
</list> </list>
</option> </option>
@ -144,12 +142,12 @@
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="XThreadsFramesViewSplitterKey" value="0.49837133" /> <property name="XThreadsFramesViewSplitterKey" value="0.49837133" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/.." /> <property name="last_opened_file_path" value="$PROJECT_DIR$/.." />
<property name="settings.editor.selected.configurable" value="preferences.sourceCode.C#" /> <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
</component> </component>
<component name="RunManager"> <component name="RunManager">
<configuration name="Compiler" type="DotNetProject" factoryName=".NET Project"> <configuration name="Compiler" type="DotNetProject" factoryName=".NET Project">
<option name="EXE_PATH" value="$PROJECT_DIR$/bin/Debug/netcoreapp3.1/Compiler.dll" /> <option name="EXE_PATH" value="$PROJECT_DIR$/bin/Debug/netcoreapp3.1/Compiler.dll" />
<option name="PROGRAM_PARAMETERS" value="" /> <option name="PROGRAM_PARAMETERS" value="--dev-mode--" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/bin/Debug/netcoreapp3.1" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/bin/Debug/netcoreapp3.1" />
<option name="PASS_PARENT_ENVS" value="1" /> <option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" /> <option name="USE_EXTERNAL_CONSOLE" value="0" />
@ -183,7 +181,8 @@
<workItem from="1597620399423" duration="389000" /> <workItem from="1597620399423" duration="389000" />
<workItem from="1597650936637" duration="537000" /> <workItem from="1597650936637" duration="537000" />
<workItem from="1597695400525" duration="4873000" /> <workItem from="1597695400525" duration="4873000" />
<workItem from="1597863017034" duration="9501000" /> <workItem from="1597863017034" duration="9651000" />
<workItem from="1597932102881" duration="4147000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -213,106 +212,110 @@
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state x="2029" y="149" width="738" height="749" key="#Compiler/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597507583637" /> <state x="2029" y="149" width="738" height="749" key="#Compiler/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597507583637" />
<state x="2339" y="185" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1597867717136"> <state x="2942" y="395" width="193" height="172" key="#Custom_Plugin_Repositories" timestamp="1597932245664">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state x="2339" y="185" key="#com.intellij.execution.impl.EditConfigurationsDialog/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597867717136" /> <state x="2942" y="395" width="193" height="172" key="#Custom_Plugin_Repositories/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597932245664" />
<state x="2327" y="101" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1597933234768">
<screen x="1920" y="0" width="1920" height="1080" />
</state>
<state x="2327" y="101" key="#com.intellij.execution.impl.EditConfigurationsDialog/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597933234768" />
<state x="2169" y="170" width="430" height="508" key="FileChooserDialogImpl" timestamp="1597507670532"> <state x="2169" y="170" width="430" height="508" key="FileChooserDialogImpl" timestamp="1597507670532">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state x="2169" y="170" width="430" height="508" key="FileChooserDialogImpl/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597507670532" /> <state x="2169" y="170" width="430" height="508" key="FileChooserDialogImpl/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597507670532" />
<state width="908" height="577" key="GridCell.Tab.0.bottom" timestamp="1597872134303"> <state width="1868" height="583" key="GridCell.Tab.0.bottom" timestamp="1597935868003">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="908" height="577" key="GridCell.Tab.0.bottom/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872134303" /> <state width="1868" height="583" key="GridCell.Tab.0.bottom/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597935868003" />
<state width="908" height="577" key="GridCell.Tab.0.center" timestamp="1597872134303"> <state width="1868" height="583" key="GridCell.Tab.0.center" timestamp="1597935868002">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="908" height="577" key="GridCell.Tab.0.center/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872134303" /> <state width="1868" height="583" key="GridCell.Tab.0.center/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597935868002" />
<state width="908" height="577" key="GridCell.Tab.0.left" timestamp="1597872134302"> <state width="1868" height="583" key="GridCell.Tab.0.left" timestamp="1597935868002">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="908" height="577" key="GridCell.Tab.0.left/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872134302" /> <state width="1868" height="583" key="GridCell.Tab.0.left/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597935868002" />
<state width="908" height="577" key="GridCell.Tab.0.right" timestamp="1597872134303"> <state width="1868" height="583" key="GridCell.Tab.0.right" timestamp="1597935868002">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="908" height="577" key="GridCell.Tab.0.right/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872134303" /> <state width="1868" height="583" key="GridCell.Tab.0.right/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597935868002" />
<state width="1868" height="383" key="GridCell.Tab.1.bottom" timestamp="1597865244687"> <state width="1868" height="383" key="GridCell.Tab.1.bottom" timestamp="1597872670367">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="1868" height="383" key="GridCell.Tab.1.bottom/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597865244687" /> <state width="1868" height="383" key="GridCell.Tab.1.bottom/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872670367" />
<state width="1868" height="383" key="GridCell.Tab.1.center" timestamp="1597865244687"> <state width="1868" height="383" key="GridCell.Tab.1.center" timestamp="1597872670367">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="1868" height="383" key="GridCell.Tab.1.center/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597865244687" /> <state width="1868" height="383" key="GridCell.Tab.1.center/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872670367" />
<state width="1868" height="383" key="GridCell.Tab.1.left" timestamp="1597865244687"> <state width="1868" height="383" key="GridCell.Tab.1.left" timestamp="1597872670367">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="1868" height="383" key="GridCell.Tab.1.left/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597865244687" /> <state width="1868" height="383" key="GridCell.Tab.1.left/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872670367" />
<state width="1868" height="383" key="GridCell.Tab.1.right" timestamp="1597865244687"> <state width="1868" height="383" key="GridCell.Tab.1.right" timestamp="1597872670367">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="1868" height="383" key="GridCell.Tab.1.right/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597865244687" /> <state width="1868" height="383" key="GridCell.Tab.1.right/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872670367" />
<state width="1868" height="383" key="GridCell.Tab.2.bottom" timestamp="1597865244687"> <state width="1868" height="383" key="GridCell.Tab.2.bottom" timestamp="1597872670367">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="1868" height="383" key="GridCell.Tab.2.bottom/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597865244687" /> <state width="1868" height="383" key="GridCell.Tab.2.bottom/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872670367" />
<state width="1868" height="383" key="GridCell.Tab.2.center" timestamp="1597865244687"> <state width="1868" height="383" key="GridCell.Tab.2.center" timestamp="1597872670367">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="1868" height="383" key="GridCell.Tab.2.center/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597865244687" /> <state width="1868" height="383" key="GridCell.Tab.2.center/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872670367" />
<state width="1868" height="383" key="GridCell.Tab.2.left" timestamp="1597865244687"> <state width="1868" height="383" key="GridCell.Tab.2.left" timestamp="1597872670367">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="1868" height="383" key="GridCell.Tab.2.left/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597865244687" /> <state width="1868" height="383" key="GridCell.Tab.2.left/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872670367" />
<state width="1868" height="383" key="GridCell.Tab.2.right" timestamp="1597865244687"> <state width="1868" height="383" key="GridCell.Tab.2.right" timestamp="1597872670367">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="1868" height="383" key="GridCell.Tab.2.right/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597865244687" /> <state width="1868" height="383" key="GridCell.Tab.2.right/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872670367" />
<state width="1868" height="383" key="GridCell.Tab.3.bottom" timestamp="1597865244687"> <state width="1868" height="383" key="GridCell.Tab.3.bottom" timestamp="1597872670367">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="1868" height="383" key="GridCell.Tab.3.bottom/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597865244687" /> <state width="1868" height="383" key="GridCell.Tab.3.bottom/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872670367" />
<state width="1868" height="383" key="GridCell.Tab.3.center" timestamp="1597865244687"> <state width="1868" height="383" key="GridCell.Tab.3.center" timestamp="1597872670367">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="1868" height="383" key="GridCell.Tab.3.center/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597865244687" /> <state width="1868" height="383" key="GridCell.Tab.3.center/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872670367" />
<state width="1868" height="383" key="GridCell.Tab.3.left" timestamp="1597865244687"> <state width="1868" height="383" key="GridCell.Tab.3.left" timestamp="1597872670367">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="1868" height="383" key="GridCell.Tab.3.left/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597865244687" /> <state width="1868" height="383" key="GridCell.Tab.3.left/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872670367" />
<state width="1868" height="383" key="GridCell.Tab.3.right" timestamp="1597865244687"> <state width="1868" height="383" key="GridCell.Tab.3.right" timestamp="1597872670367">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="1868" height="383" key="GridCell.Tab.3.right/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597865244687" /> <state width="1868" height="383" key="GridCell.Tab.3.right/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872670367" />
<state width="1868" height="383" key="GridCell.Tab.4.bottom" timestamp="1597865244688"> <state width="1868" height="383" key="GridCell.Tab.4.bottom" timestamp="1597872670367">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="1868" height="383" key="GridCell.Tab.4.bottom/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597865244688" /> <state width="1868" height="383" key="GridCell.Tab.4.bottom/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872670367" />
<state width="1868" height="383" key="GridCell.Tab.4.center" timestamp="1597865244688"> <state width="1868" height="383" key="GridCell.Tab.4.center" timestamp="1597872670367">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="1868" height="383" key="GridCell.Tab.4.center/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597865244688" /> <state width="1868" height="383" key="GridCell.Tab.4.center/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872670367" />
<state width="1868" height="383" key="GridCell.Tab.4.left" timestamp="1597865244687"> <state width="1868" height="383" key="GridCell.Tab.4.left" timestamp="1597872670367">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="1868" height="383" key="GridCell.Tab.4.left/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597865244687" /> <state width="1868" height="383" key="GridCell.Tab.4.left/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872670367" />
<state width="1868" height="383" key="GridCell.Tab.4.right" timestamp="1597865244688"> <state width="1868" height="383" key="GridCell.Tab.4.right" timestamp="1597872670367">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state width="1868" height="383" key="GridCell.Tab.4.right/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597865244688" /> <state width="1868" height="383" key="GridCell.Tab.4.right/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872670367" />
<state x="631" y="291" width="806" height="524" key="Rider.ProjectTemplateDialog.Size" timestamp="1597872082099"> <state x="631" y="291" width="806" height="524" key="Rider.ProjectTemplateDialog.Size" timestamp="1597872082099">
<screen x="0" y="0" width="1920" height="1080" /> <screen x="0" y="0" width="1920" height="1080" />
</state> </state>
<state x="631" y="291" width="806" height="524" key="Rider.ProjectTemplateDialog.Size/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872082099" /> <state x="631" y="291" width="806" height="524" key="Rider.ProjectTemplateDialog.Size/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597872082099" />
<state x="2336" y="41" width="709" height="485" key="RiderGenerateDialog" timestamp="1597863779733"> <state x="2333" y="20" width="709" height="485" key="RiderGenerateDialog" timestamp="1597935008077">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state x="2336" y="41" width="709" height="485" key="RiderGenerateDialog/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597863779733" /> <state x="2333" y="20" width="709" height="485" key="RiderGenerateDialog/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597935008077" />
<state x="2233" y="185" width="1031" height="724" key="SettingsEditor" timestamp="1597620460972"> <state x="2525" y="135" width="1031" height="724" key="SettingsEditor" timestamp="1597932248704">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state x="2233" y="185" width="1031" height="724" key="SettingsEditor/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597620460972" /> <state x="2525" y="135" width="1031" height="724" key="SettingsEditor/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597932248704" />
<state x="2560" y="0" width="640" height="1080" key="VCS.FileHistoryDialog" timestamp="1597605666894"> <state x="2560" y="0" width="640" height="1080" key="VCS.FileHistoryDialog" timestamp="1597605666894">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
@ -325,14 +328,18 @@
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state x="2182" y="199" width="432" height="650" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597510086756" /> <state x="2182" y="199" width="432" height="650" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597510086756" />
<state x="960" y="34" width="960" height="1046" key="dock-window-1" timestamp="1597620461385"> <state x="2880" y="0" width="960" height="1080" key="dock-window-1" timestamp="1597934748776">
<screen x="0" y="0" width="1920" height="1080" />
</state>
<state x="960" y="34" width="960" height="1046" key="dock-window-1/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597620461385" />
<state x="1920" y="0" width="1920" height="1080" key="dock-window-2" timestamp="1597620461385">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>
<state x="1920" y="0" width="1920" height="1080" key="dock-window-2/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597620461385" /> <state x="2880" y="0" width="960" height="1080" key="dock-window-1/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597934748776" />
<state x="2880" y="0" width="960" height="1080" key="dock-window-2" timestamp="1597934748776">
<screen x="1920" y="0" width="1920" height="1080" />
</state>
<state x="2880" y="0" width="960" height="1080" key="dock-window-2/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597934748776" />
<state x="0" y="557" width="1920" height="523" key="dock-window-3" timestamp="1597934748776">
<screen x="0" y="0" width="1920" height="1080" />
</state>
<state x="0" y="557" width="1920" height="523" key="dock-window-3/1920.0.1920.1080/0.0.1920.1080@1920.0.1920.1080" timestamp="1597934748776" />
<state x="2543" y="239" width="672" height="678" key="search.everywhere.popup" timestamp="1597698616567"> <state x="2543" y="239" width="672" height="678" key="search.everywhere.popup" timestamp="1597698616567">
<screen x="1920" y="0" width="1920" height="1080" /> <screen x="1920" y="0" width="1920" height="1080" />
</state> </state>

59
Compiler/Compiler.cs
View file

@ -18,6 +18,42 @@ namespace Compiler
Console.WriteLine("Usage: Compiler <input path> [optional: -v]"); Console.WriteLine("Usage: Compiler <input path> [optional: -v]");
} }
else else
{
if (args[0] != "--dev-mode--")
{
NonDevMode(args);
}
else
{
DevMode();
}
}
}
static void DevMode()
{
for (int i = 1; i <= 2; i++)
{
Console.WriteLine($"---------------------valid, stage {i}-------------------------------");
foreach (string file in Directory.GetFiles($"/home/clemens/repositorys/lcc/stage_{i}/valid"))
{
Console.WriteLine("-------------");
List<Token> tokens = TestLexer(file, 0);
TestParser(tokens, file, 1);
}
Console.WriteLine($"---------------------invalid, stage {i}-------------------------------");
foreach (string file in Directory.GetFiles($"/home/clemens/repositorys/lcc/stage_{i}/invalid"))
{
Console.WriteLine("-------------");
List<Token> tokens = TestLexer(file, 0);
TestParser(tokens, file, 1);
}
}
}
static void NonDevMode(string[] args)
{ {
bool debug = false; bool debug = false;
string inputFileName = args[0].Split("/").Last(); string inputFileName = args[0].Split("/").Last();
@ -58,7 +94,6 @@ namespace Compiler
Console.WriteLine("Deleted assembly.s file. Done!"); Console.WriteLine("Deleted assembly.s file. Done!");
} }
} }
}
static void Compile(string inputPath, string outputPath, bool debug) static void Compile(string inputPath, string outputPath, bool debug)
@ -102,7 +137,27 @@ namespace Compiler
static void PrettyPrint(Node root, string indent) static void PrettyPrint(Node root, string indent)
{ {
Console.WriteLine(indent + root.NodeType); switch (root.NodeType)
{
case NodeType.ExpressionNode:
if (root is UnaryOperatorNode)
{
Console.WriteLine(indent + root.NodeType + ":" + ((UnaryOperatorNode) root).OperatorType);
}
if (root is ConstantNode)
{
Console.WriteLine(indent + root.NodeType + ":" + ((ConstantNode) root).value);
}
break;
case NodeType.FunctionNode:
Console.WriteLine(indent + root.NodeType + ":" + ((FunctionNode) root).Name);
break;
case NodeType.ProgramNode:
case NodeType.ReturnStatementNode:
break;
}
foreach (Node child in root.Children) foreach (Node child in root.Children)
{ {
PrettyPrint(child, indent + " "); PrettyPrint(child, indent + " ");

7
Compiler/Lexer/Lexer.cs
View file

@ -47,6 +47,9 @@ namespace Compiler.Lexer
patterns.Add(new Pattern(@"^;", TokenType.SemicolonToken)); patterns.Add(new Pattern(@"^;", TokenType.SemicolonToken));
patterns.Add(new Pattern(@"^[a-zA-Z]\w*", TokenType.IdentifierToken)); patterns.Add(new Pattern(@"^[a-zA-Z]\w*", TokenType.IdentifierToken));
patterns.Add(new Pattern(@"^[0-9]+", TokenType.IntegerLiteralToken)); patterns.Add(new Pattern(@"^[0-9]+", TokenType.IntegerLiteralToken));
patterns.Add(new Pattern(@"^-", TokenType.NegationToken));
patterns.Add(new Pattern(@"^~", TokenType.BitwiseComplementToken));
patterns.Add(new Pattern(@"^!", TokenType.LogicalNegationToken));
//try each pattern do determine if it is the one matching at the beginning //try each pattern do determine if it is the one matching at the beginning
//TODO: There sure is room for optimization here //TODO: There sure is room for optimization here
@ -83,6 +86,10 @@ namespace Compiler.Lexer
case TokenType.CloseBraceToken: case TokenType.CloseBraceToken:
case TokenType.IntToken: case TokenType.IntToken:
case TokenType.SemicolonToken: case TokenType.SemicolonToken:
case TokenType.NegationToken:
case TokenType.BitwiseComplementToken:
case TokenType.LogicalNegationToken:
case TokenType.InvalidToken:
break; break;
default: default:
t.TokenType = TokenType.InvalidToken; t.TokenType = TokenType.InvalidToken;

5
Compiler/Lexer/TokenType.cs
View file

@ -12,6 +12,11 @@ namespace Compiler.Lexer
IdentifierToken, IdentifierToken,
IntegerLiteralToken, IntegerLiteralToken,
//unary operator tokens
NegationToken,
BitwiseComplementToken,
LogicalNegationToken,
//special Token to represent invalid matches //special Token to represent invalid matches
InvalidToken, InvalidToken,
} }

3
Compiler/Parser/Nodes/NodeType.cs
View file

@ -5,6 +5,7 @@ namespace Compiler.Parser.Nodes
ProgramNode, ProgramNode,
FunctionNode, FunctionNode,
ReturnStatementNode, ReturnStatementNode,
ExpressionNode ExpressionNode,
} }
} }

10
Compiler/Parser/Nodes/OperatorType.cs Normal file
View file

@ -0,0 +1,10 @@
namespace Compiler.Parser.Nodes
{
public enum OperatorType
{
//unary operators
Negation,
BitwiseComplement,
LogicalNegation,
}
}

14
Compiler/Parser/Nodes/UnaryOperatorNode.cs Normal file
View file

@ -0,0 +1,14 @@
namespace Compiler.Parser.Nodes
{
public sealed class UnaryOperatorNode : Node
{
public override NodeType NodeType { get; set; }
public OperatorType OperatorType { get; set; }
public UnaryOperatorNode(OperatorType operatorType)
{
OperatorType = operatorType;
NodeType = NodeType.ExpressionNode;
}
}
}

45
Compiler/Parser/Parser.cs
View file

@ -112,26 +112,51 @@ namespace Compiler.Parser
throw new MissingTokenException(TokenType.IntegerLiteralToken); throw new MissingTokenException(TokenType.IntegerLiteralToken);
} }
Token constantToken = _tokenList[0]; Token expressionToken = _tokenList[0];
//check if TokenType is right //the next token might be a constant or any operator
if (constantToken.TokenType != TokenType.IntegerLiteralToken) switch (expressionToken.TokenType)
{
throw new UnexpectedTokenException(TokenType.IntToken, constantToken.TokenType);
}
else
{ {
case TokenType.IntegerLiteralToken:
//remove int literal token //remove int literal token
_tokenList.RemoveAt(0); _tokenList.RemoveAt(0);
//check if value Type is right //check if value Type is right
if (constantToken.Value.GetType() != typeof(int)) if (expressionToken.Value.GetType() != typeof(int))
{ {
throw new WrongTypeException(typeof(int), constantToken.Value.GetType()); throw new WrongTypeException(typeof(int), expressionToken.Value.GetType());
} }
//return final constant node to end recursion //return final constant node to end recursion
n = new ConstantNode((int) constantToken.Value); n = new ConstantNode((int) expressionToken.Value);
break;
case TokenType.NegationToken:
_tokenList.RemoveAt(0);
n = new UnaryOperatorNode(OperatorType.Negation);
n.Children.Add(Parse(NodeType.ExpressionNode));
break;
case TokenType.BitwiseComplementToken:
_tokenList.RemoveAt(0);
n = new UnaryOperatorNode(OperatorType.BitwiseComplement);
n.Children.Add(Parse(NodeType.ExpressionNode));
break;
case TokenType.LogicalNegationToken:
_tokenList.RemoveAt(0);
n = new UnaryOperatorNode(OperatorType.LogicalNegation);
n.Children.Add(Parse(NodeType.ExpressionNode));
break;
case TokenType.IntToken:
case TokenType.OpenParenthesisToken:
case TokenType.CloseParenthesisToken:
case TokenType.OpenBraceToken:
case TokenType.CloseBraceToken:
case TokenType.ReturnToken:
case TokenType.SemicolonToken:
case TokenType.IdentifierToken:
case TokenType.InvalidToken:
throw new UnexpectedTokenException(TokenType.IntToken, expressionToken.TokenType);
default:
throw new UnexpectedTokenException(TokenType.IntToken, expressionToken.TokenType);
} }
break; break;

3
grammar
View file

@ -1,4 +1,5 @@
<program> ::= <function> <program> ::= <function>
<function> ::= "int" <id> "(" ")" "{" <statement> "}" <function> ::= "int" <id> "(" ")" "{" <statement> "}"
<statement> ::= "return" <exp> ";" <statement> ::= "return" <exp> ";"
<exp> ::= <int> <exp> ::= <unary_op> <exp> | <int>
<unary_op> ::= "!" | "~" | "-"

3
stage_2/invalid/missing_const.c Normal file
View file

@ -0,0 +1,3 @@
int main() {
return !;
}

3
stage_2/invalid/missing_semicolon.c Normal file
View file

@ -0,0 +1,3 @@
int main() {
return !5
}

3
stage_2/invalid/nested_missing_const.c Normal file
View file

@ -0,0 +1,3 @@
int main() {
return !~;
}

3
stage_2/invalid/wrong_order.c Normal file
View file

@ -0,0 +1,3 @@
int main() {
return 4-;
}

3
stage_2/valid/bitwise.c Normal file
View file

@ -0,0 +1,3 @@
int main() {
return !12;
}

3
stage_2/valid/bitwise_zero.c Normal file
View file

@ -0,0 +1,3 @@
int main() {
return ~0;
}

3
stage_2/valid/neg.c Normal file
View file

@ -0,0 +1,3 @@
int main() {
return -5;
}

3
stage_2/valid/nested_ops.c Normal file
View file

@ -0,0 +1,3 @@
int main() {
return !-3;
}

3
stage_2/valid/nested_ops_2.c Normal file
View file

@ -0,0 +1,3 @@
int main() {
return -~0;
}

3
stage_2/valid/not_five.c Normal file
View file

@ -0,0 +1,3 @@
int main() {
return !5;
}

3
stage_2/valid/not_zero.c Normal file
View file

@ -0,0 +1,3 @@
int main() {
return !0;
}