humenius/dhbw-compilerbau
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[12 - Tree Grammar] Add type check

Browse Source
This commit is contained in:
Humenius
2020-06-13 19:16:35 +02:00
parent 04c18d4fdf
commit 54d6ea874e
10 changed files with 1726 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
.idea/workspace.xml generated
View File

@@ -2,22 +2,16 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="a11aa5c4-505d-4bfb-9e81-72367c118bbe" name="Default Changelist" comment=""> <list default="true" id="a11aa5c4-505d-4bfb-9e81-72367c118bbe" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/runConfigurations/Run_Antlr_builder.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/runConfigurations/Run_Antlr_builder.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/AntlrXTreeGrammarMain.java" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/AntlrXTreeGrammarMain.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/AntlrXCompiler.java" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/AntlrXCompiler.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/AssignCount.g" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/AssignCount.g" afterDir="false" /> <change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/X.g" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/X.g" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/AssignCount.java" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/AssignCount.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/XOptimizer.g" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/XOptimizer.g" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/AssignCount.tokens" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/AssignCount.tokens" afterDir="false" /> <change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/XTypeCheck.g" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/XTypeCheck.g" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/XLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/XLexer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/XTypeCheck.java" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/XTypeCheck.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/XParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/XParser.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/XTypeCheck.tokens" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/XTypeCheck.tokens" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/XTreeGrammar.g" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/XTreeGrammar.g" afterDir="false" /> <change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/test/OptimizerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/test/OptimizerTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/XTreeGrammar.java" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/XTreeGrammar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/test/ParseTreeTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/test/ParseTreeTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/XTreeGrammar.tokens" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/XTreeGrammar.tokens" afterDir="false" /> <change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/test/TypeCheckTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/test/TypeCheckTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/test/AssignCountTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/test/AssignCountTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/test/ParseTreeTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/test/ParseTreeTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/test/TokenStreamTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/test/TokenStreamTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/test/TreeGrammarTreeTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/CC-Praxis-Antlr Baumgrammatiken-Leer/src/de/dhbw/compiler/antlrxtreegrammar/test/TreeGrammarTreeTest.java" afterDir="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" />
@@ -43,7 +37,7 @@
<property name="project.structure.proportion" value="0.15429688" /> <property name="project.structure.proportion" value="0.15429688" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
</component> </component>
<component name="RunManager" selected="JUnit.TestAntlrXAssignCount1"> <component name="RunManager" selected="JUnit.TestAntlrXTypeCheck">
<configuration name="AntlrXTreeGrammarMain" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <configuration name="AntlrXTreeGrammarMain" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="de.dhbw.compiler.antlrxtreegrammar.AntlrXTreeGrammarMain" /> <option name="MAIN_CLASS_NAME" value="de.dhbw.compiler.antlrxtreegrammar.AntlrXTreeGrammarMain" />
<module name="CC-Praxis-Antlr Baumgrammatiken-Leer" /> <module name="CC-Praxis-Antlr Baumgrammatiken-Leer" />
@@ -144,19 +138,22 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<configuration name="TestAntlrXScanner1.tokenStringConst" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true"> <configuration name="TestAntlrXTypeCheck" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="CC-Praxis-Antlr Parser fuer X-Leer" /> <module name="CC-Praxis-Antlr X Uebersetzer-Leer" />
<useClassPathOnly />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="de.dhbw.compiler.antlrxparser.test.*" /> <option name="PATTERN" value="de.dhbw.compiler.antlrxcompiler.test.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>
<option name="PACKAGE_NAME" value="de.dhbw.compiler.antlrxparser.test" /> <option name="PACKAGE_NAME" value="de.dhbw.compiler.antlrxcompiler.test" />
<option name="MAIN_CLASS_NAME" value="de.dhbw.compiler.antlrxparser.test.TestAntlrXScanner1" /> <option name="MAIN_CLASS_NAME" value="de.dhbw.compiler.antlrxcompiler.test.TestAntlrXTypeCheck" />
<option name="METHOD_NAME" value="tokenStringConst" /> <option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="method" /> <option name="TEST_OBJECT" value="class" />
<option name="PARAMETERS" value="" />
<method v="2"> <method v="2">
<option name="RunConfigurationTask" enabled="true" run_configuration_name="Run Antlr Builder" run_configuration_type="Application" />
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
@@ -166,17 +163,17 @@
<item itemvalue="JUnit.TestAntlrXScanner1" /> <item itemvalue="JUnit.TestAntlrXScanner1" />
<item itemvalue="JUnit.TestAntlrXScanner1.tokenASSIGN" /> <item itemvalue="JUnit.TestAntlrXScanner1.tokenASSIGN" />
<item itemvalue="JUnit.TestAntlrXParser1" /> <item itemvalue="JUnit.TestAntlrXParser1" />
<item itemvalue="JUnit.TestAntlrXScanner1.tokenStringConst" />
<item itemvalue="JUnit.TestAntlrXAssignCount" /> <item itemvalue="JUnit.TestAntlrXAssignCount" />
<item itemvalue="JUnit.TestAntlrXAssignCount1" /> <item itemvalue="JUnit.TestAntlrXAssignCount1" />
<item itemvalue="JUnit.TestAntlrXTypeCheck" />
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="JUnit.TestAntlrXTypeCheck" />
<item itemvalue="JUnit.TestAntlrXAssignCount1" /> <item itemvalue="JUnit.TestAntlrXAssignCount1" />
<item itemvalue="JUnit.TestAntlrXAssignCount" /> <item itemvalue="JUnit.TestAntlrXAssignCount" />
<item itemvalue="Application.AntlrXTreeGrammarMain" /> <item itemvalue="Application.AntlrXTreeGrammarMain" />
<item itemvalue="JUnit.TestAntlrXParser1" /> <item itemvalue="JUnit.TestAntlrXParser1" />
<item itemvalue="JUnit.TestAntlrXScanner1.tokenStringConst" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
@@ -197,7 +194,8 @@
<workItem from="1591771652663" duration="1715000" /> <workItem from="1591771652663" duration="1715000" />
<workItem from="1591962621113" duration="4935000" /> <workItem from="1591962621113" duration="4935000" />
<workItem from="1591970247448" duration="49000" /> <workItem from="1591970247448" duration="49000" />
<workItem from="1591970308877" duration="300000" /> <workItem from="1591970308877" duration="728000" />
<workItem from="1592059055121" duration="9317000" />
</task> </task>
<servers /> <servers />
</component> </component>
@@ -213,11 +211,11 @@
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="570" y="121" key="#TestAntlrXScanner1.tokenASSIGN/0.0.1920.1040@0.0.1920.1040" timestamp="1591175187591" /> <state x="570" y="121" key="#TestAntlrXScanner1.tokenASSIGN/0.0.1920.1040@0.0.1920.1040" timestamp="1591175187591" />
<state x="-1471" y="200" width="1471" height="691" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1591969874169"> <state x="-1471" y="200" width="1471" height="691" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1592066371011">
<screen x="-1920" y="0" width="1920" height="1040" /> <screen x="-1920" y="0" width="1920" height="1040" />
</state> </state>
<state x="184" y="112" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1440.900@0.0.1440.900" timestamp="1591172899381" /> <state x="184" y="112" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1440.900@0.0.1440.900" timestamp="1591172899381" />
<state x="-1471" y="200" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1591969874169" /> <state x="-1471" y="200" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1592066371011" />
<state x="-37" y="200" width="1471" height="691" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1591184444701" /> <state x="-37" y="200" width="1471" height="691" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1591184444701" />
<state x="92" y="92" width="1736" height="856" key="#com.intellij.execution.junit2.states.ComparisonFailureState$DiffDialog" timestamp="1591185724270"> <state x="92" y="92" width="1736" height="856" key="#com.intellij.execution.junit2.states.ComparisonFailureState$DiffDialog" timestamp="1591185724270">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
@@ -232,38 +230,38 @@
</state> </state>
<state x="1003" y="171" key="#com.intellij.ide.macro.MacrosDialog/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1591969389618" /> <state x="1003" y="171" key="#com.intellij.ide.macro.MacrosDialog/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1591969389618" />
<state x="700" y="183" key="#com.intellij.ide.macro.MacrosDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1591184444196" /> <state x="700" y="183" key="#com.intellij.ide.macro.MacrosDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1591184444196" />
<state x="690" y="267" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1591969353358"> <state x="690" y="267" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1592059799792">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="690" y="267" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1591969353358" /> <state x="690" y="267" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1592059799792" />
<state x="700" y="233" key="FileChooserDialogImpl" timestamp="1591968457509"> <state x="700" y="233" key="FileChooserDialogImpl" timestamp="1591968457509">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="700" y="233" key="FileChooserDialogImpl/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1591968457509" /> <state x="700" y="233" key="FileChooserDialogImpl/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1591968457509" />
<state x="700" y="233" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1591184758908" /> <state x="700" y="233" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1591184758908" />
<state width="1877" height="178" key="GridCell.Tab.0.bottom" timestamp="1591970233761"> <state width="1877" height="321" key="GridCell.Tab.0.bottom" timestamp="1592068345609">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1398" height="245" key="GridCell.Tab.0.bottom/0.0.1440.900@0.0.1440.900" timestamp="1591173185826" /> <state width="1398" height="245" key="GridCell.Tab.0.bottom/0.0.1440.900@0.0.1440.900" timestamp="1591173185826" />
<state width="1877" height="178" key="GridCell.Tab.0.bottom/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1591970233761" /> <state width="1877" height="321" key="GridCell.Tab.0.bottom/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1592068345609" />
<state width="916" height="398" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1591188037708" /> <state width="916" height="398" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1591188037708" />
<state width="1877" height="178" key="GridCell.Tab.0.center" timestamp="1591970233761"> <state width="1877" height="321" key="GridCell.Tab.0.center" timestamp="1592068345609">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1398" height="245" key="GridCell.Tab.0.center/0.0.1440.900@0.0.1440.900" timestamp="1591173185825" /> <state width="1398" height="245" key="GridCell.Tab.0.center/0.0.1440.900@0.0.1440.900" timestamp="1591173185825" />
<state width="1877" height="178" key="GridCell.Tab.0.center/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1591970233761" /> <state width="1877" height="321" key="GridCell.Tab.0.center/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1592068345609" />
<state width="916" height="398" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1591188037708" /> <state width="916" height="398" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1591188037708" />
<state width="1877" height="178" key="GridCell.Tab.0.left" timestamp="1591970233761"> <state width="1877" height="321" key="GridCell.Tab.0.left" timestamp="1592068345609">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1398" height="245" key="GridCell.Tab.0.left/0.0.1440.900@0.0.1440.900" timestamp="1591173185825" /> <state width="1398" height="245" key="GridCell.Tab.0.left/0.0.1440.900@0.0.1440.900" timestamp="1591173185825" />
<state width="1877" height="178" key="GridCell.Tab.0.left/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1591970233761" /> <state width="1877" height="321" key="GridCell.Tab.0.left/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1592068345609" />
<state width="916" height="398" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1591188037708" /> <state width="916" height="398" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1591188037708" />
<state width="1877" height="178" key="GridCell.Tab.0.right" timestamp="1591970233761"> <state width="1877" height="321" key="GridCell.Tab.0.right" timestamp="1592068345609">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1398" height="245" key="GridCell.Tab.0.right/0.0.1440.900@0.0.1440.900" timestamp="1591173185826" /> <state width="1398" height="245" key="GridCell.Tab.0.right/0.0.1440.900@0.0.1440.900" timestamp="1591173185826" />
<state width="1877" height="178" key="GridCell.Tab.0.right/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1591970233761" /> <state width="1877" height="321" key="GridCell.Tab.0.right/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1592068345609" />
<state width="916" height="398" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1591188037708" /> <state width="916" height="398" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1591188037708" />
<state x="447" y="180" width="688" height="753" key="NewModule_or_Project.wizard" timestamp="1591968463391"> <state x="447" y="180" width="688" height="753" key="NewModule_or_Project.wizard" timestamp="1591968463391">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
@@ -280,9 +278,9 @@
</state> </state>
<state x="208" y="31" key="SettingsEditor/0.0.1440.900@0.0.1440.900" timestamp="1591172804318" /> <state x="208" y="31" key="SettingsEditor/0.0.1440.900@0.0.1440.900" timestamp="1591172804318" />
<state x="277" y="36" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1591184318089" /> <state x="277" y="36" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1591184318089" />
<state x="623" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1591969820924"> <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1592063655606">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="623" y="225" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1591969820924" /> <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1592063655606" />
</component> </component>
</project> </project>

2
CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/AntlrXCompiler.java
View File

@@ -90,6 +90,8 @@ public class AntlrXCompiler {
// Type check // Type check
XTypeCheck typeCheck = new XTypeCheck(new CommonTreeNodeStream(xTreeAdaptor, tree)); XTypeCheck typeCheck = new XTypeCheck(new CommonTreeNodeStream(xTreeAdaptor, tree));
CommonTree typeCheckedTree = typeCheck.program().getTree(); CommonTree typeCheckedTree = typeCheck.program().getTree();
// X to Java // X to Java
XtoJava javaConverter = new XtoJava(new CommonTreeNodeStream(xTreeAdaptor, typeCheckedTree)); XtoJava javaConverter = new XtoJava(new CommonTreeNodeStream(xTreeAdaptor, typeCheckedTree));

2
CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/X.g
View File

@@ -60,7 +60,7 @@ decl: ID ':' (type='int' | type='float' | type='string') ';' -> ^(DECL ID
decllist: decl* -> ^(DECLLIST decl*); decllist: decl* -> ^(DECLLIST decl*);
// Ausdr<64>cke // Ausdr<64>cke
expr: multexpr (('+'^ | '-'^) multexpr)*; expr: multexpr (('+'^ | '-'^) multexpr)*;
multexpr: simpleexpr (('*'^ | '/'^) simpleexpr)*; multexpr: simpleexpr (('*'^ | '/'^) simpleexpr)*;
simpleexpr: '('! expr ')'! simpleexpr: '('! expr ')'!
| INTCONST | '-' INTCONST -> ^(UMINUS INTCONST) | INTCONST | '-' INTCONST -> ^(UMINUS INTCONST)

6
CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/XOptimizer.g
View File

@@ -18,7 +18,7 @@ options {
private String addString(String first, String last) { private String addString(String first, String last) {
return first.substring(0, first.length()-1)+last.substring(1); return first.substring(0, first.length()-1)+last.substring(1);
} }
private String opInt(String first, String last, char op) { private String opInt(String first, String last, char op) {
int firstValue = 0; int firstValue = 0;
int lastValue = 0; int lastValue = 0;
@@ -36,7 +36,7 @@ options {
default: return ""; default: return "";
} }
} }
private String opFloat(String first, String last, char op) { private String opFloat(String first, String last, char op) {
double firstValue = 0.0; double firstValue = 0.0;
double lastValue = 0.0; double lastValue = 0.0;
@@ -54,7 +54,7 @@ options {
default: return ""; default: return "";
} }
} }
} }

170
CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/XTypeCheck.g
View File

@@ -1,14 +1,3 @@
/* **********************************************
* Duale Hochschule Baden-Württemberg Karlsruhe
* Prof. Dr. Jörn Eisenbiegler
*
* Vorlesung Übersetzerbau
* Praxis ANTLR-Übersetzer für X
* - Typ-Prüfung
*
* **********************************************
*/
tree grammar XTypeCheck; tree grammar XTypeCheck;
options { options {
@@ -23,108 +12,105 @@ tokens{
} }
@header { @header {
package de.dhbw.compiler.antlrxcompiler; package de.dhbw.compiler.antlrxcompiler;
import java.util.HashMap; import java.util.HashMap;
} }
@members { @members {
private SymbolTable symbols = SymbolTable.getInstance(); private SymbolTable symbols = SymbolTable.getInstance();
private void error(XTree tree, String message) { private void logError(XTree tree, String message) {
System.err.println("Error at "+tree.getLine()+","+tree.getCharPositionInLine()+": "+message); System.err.println(message + "\n\t" + tree);
} }
} }
// Deklarationen
decl: decl:
^(DECL ID 'int' r='read'? p='print'?) ^(DECL ID type='int' read='read'? print='print'?)
{ symbols.put($ID.text, new Symbol($ID.text, XType.IntType, $r!=null, $p!=null)); } { symbols.put($ID.text, new Symbol($ID.text, XType.IntType, ($read != null), ($print != null))); }
| ^(DECL ID 'float' r='read'? p='print'?) | ^(DECL ID type='float' read='read'? print='print'?)
{ symbols.put($ID.text, new Symbol($ID.text, XType.FloatType, $r!=null, $p!=null)); } { symbols.put($ID.text, new Symbol($ID.text, XType.FloatType, ($read != null), ($print != null))); }
| ^(DECL ID 'string' r='read'? p='print'?) | ^(DECL ID type='string' read='read'? print='print'?)
{ symbols.put($ID.text, new Symbol($ID.text, XType.StringType, $r!=null, $p!=null)); } ; { symbols.put($ID.text, new Symbol($ID.text, XType.StringType, ($read != null), ($print != null))); }
;
decllist: ^(DECLLIST decl*); decllist: ^(DECLLIST decl*);
// Expr und Cond!!
expr: expr:
^(op=('+' | '-' | '/' | '*') left=expr right=expr)
^(op=('+' | '-' | '/' | '*') l=expr r=expr) {
{ if ($left.tree.exprType == XType.IntType && $right.tree.exprType == XType.IntType) {
if ($l.tree.exprType==XType.IntType && $r.tree.exprType==XType.IntType) { $op.tree.exprType = XType.IntType;
$op.tree.exprType=XType.IntType; } else if (($left.tree.exprType == XType.FloatType || $left.tree.exprType == XType.IntType) &&
} else if (($l.tree.exprType==XType.IntType || $l.tree.exprType==XType.FloatType) && ($right.tree.exprType == XType.FloatType || $right.tree.exprType == XType.IntType)) {
($r.tree.exprType==XType.IntType || $r.tree.exprType==XType.FloatType)) { $op.tree.exprType = XType.FloatType;
$op.tree.exprType=XType.FloatType; } else if ($left.tree.exprType == XType.StringType && $right.tree.exprType == XType.StringType && $op.type == PLUS) {
} else if ($l.tree.exprType==XType.StringType && $r.tree.exprType==XType.StringType && $op.type==PLUS) { $op.tree.exprType = XType.StringType;
$op.tree.exprType=XType.StringType; } else {
} else { $op.tree.exprType = XType.InvalidType;
$op.tree.exprType=XType.InvalidType; logError($op, "Invalid operator '" + $op.text + "' for '" + $left.tree.exprType + "' and '" + $right.tree.exprType + "'");
error($op,$op.text+" is not valid for operands "+$l.tree.exprType+" and "+$r.tree.exprType+"."); }
} }
} | ^(op=UMINUS e=expr) { $op.tree.exprType = $e.tree.exprType; }
| INTCONST { $INTCONST.tree.exprType = XType.IntType; }
| FLOATCONST { $FLOATCONST.tree.exprType = XType.FloatType; }
| STRINGCONST { $STRINGCONST.tree.exprType = XType.StringType; }
| ID {
if (symbols.containsKey($ID.text)) {
$ID.tree.exprType = symbols.get($ID.text).type;
} else {
$ID.tree.exprType = XType.InvalidType;
logError($ID, "'" + $ID.text + "' is not defined.");
}
}
;
| ^(op=UMINUS e=expr) assignstat:
{ ^(op=':=' ID e=expr)
$op.tree.exprType=$e.tree.exprType; {
} if (!symbols.containsKey($ID.text)) {
$ID.tree.exprType = XType.InvalidType;
$op.tree.exprType = XType.InvalidType;
logError($ID, "Undeclared var '" + $ID.text + "'");
} else {
$ID.tree.exprType = symbols.get($ID.text).type;
| INTCONST { $INTCONST.tree.exprType=XType.IntType; } // float <- int
| FLOATCONST { $FLOATCONST.tree.exprType=XType.FloatType; } if ($ID.tree.exprType == XType.FloatType && $e.tree.exprType == XType.IntType) {
| STRINGCONST { $STRINGCONST.tree.exprType=XType.StringType; } $op.tree.exprType = XType.FloatType;
| ID { if (!symbols.containsKey($ID.text)) { } else if ($ID.tree.exprType != $expr.tree.exprType) {
$ID.tree.exprType=XType.InvalidType; $op.tree.exprType = XType.InvalidType;
error($ID,"Variable "+$ID.text+" is not defined."); logError($op, "Cannot assign <" + $expr.tree.exprType + "> to <" + $ID.tree.exprType + ">");
} else { } else {
$ID.tree.exprType=symbols.get($ID.text).type; $op.tree.exprType = $ID.tree.exprType;
} }
}; }
// Zuweisungen
assignstat: ^(op=':=' ID expr)
{ if (!symbols.containsKey($ID.text)) {
$ID.tree.exprType=XType.InvalidType;
$op.tree.exprType=XType.InvalidType;
error($ID,"Variable "+$ID.text+" is not defined.");
} else {
$ID.tree.exprType=symbols.get($ID.text).type;
if ($ID.tree.exprType==XType.FloatType && $expr.tree.exprType==XType.IntType) {
$op.tree.exprType=XType.FloatType;
} else if ($ID.tree.exprType!=$expr.tree.exprType) {
$op.tree.exprType=XType.InvalidType;
error($op,"An expression of type "+$expr.tree.exprType+
" cannot be assigned to a variable of type "+$ID.tree.exprType+".");
} else {
$op.tree.exprType=$ID.tree.exprType;
}
} }
}; ;
// Bedingungen cond:
cond: ^(op=('<' |'>' |'=') l=expr r=expr) ^(op=('<' | '>' | '=') left=expr right=expr)
{ if ($l.tree.exprType==XType.StringType || $r.tree.exprType==XType.StringType) { {
error($op,$op.text+" is not valid for string operands."); if ($left.tree.exprType == XType.StringType || $right.tree.exprType == XType.StringType) {
} else if ($l.tree.exprType==XType.IntType && $r.tree.exprType==XType.IntType) { $op.tree.exprType = XType.InvalidType;
$op.tree.exprType=XType.IntType; logError($op, "Cannot use operator '" + $op.text + "' on '" + $left.text + "' and '" + $right.text + "'");
} else { } else if ($left.tree.exprType == XType.IntType && $right.tree.exprType == XType.IntType) {
$op.tree.exprType=XType.FloatType; $op.tree.exprType = XType.IntType;
} else {
$op.tree.exprType = XType.FloatType;
}
} }
}; ;
// Bedingte Zuweisung condstat: ^(op='if' cond stat stat?);
condstat: ^('if' cond stat stat?);
// Schleifen whilestat: ^('while' cond stat);
whilestat: ^('while' cond stat); forstat: ^('for' assignstat cond assignstat stat);
forstat: ^('for' assignstat cond assignstat stat);
// Anweisungen stat: assignstat | condstat | whilestat | forstat | statlist;
stat: assignstat | condstat | whilestat | forstat | statlist;
statlist: ^(STATLIST stat*); statlist: ^(STATLIST stat*);
// Programme program: { symbols.clear(); } ^('program' ID decllist statlist);
program: { symbols.clear(); } ^('program' ID decllist statlist);

1618
CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/XTypeCheck.java
View File

File diff suppressed because it is too large Load Diff

2
CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/XTypeCheck.tokens
View File

@@ -40,7 +40,6 @@ STRINGCONST=16
UMINUS=17 UMINUS=17
WS=18 WS=18
ZERO=19 ZERO=19
T__46=46
PLUS=23 PLUS=23
'('=20 '('=20
')'=21 ')'=21
@@ -68,4 +67,3 @@ PLUS=23
'string'=43 'string'=43
'then'=44 'then'=44
'while'=45 'while'=45
'todo'=46

10
CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/test/OptimizerTest.java
View File

@@ -16,21 +16,15 @@ import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import de.dhbw.compiler.antlrxcompiler.*;
import org.antlr.runtime.ANTLRInputStream; import org.antlr.runtime.ANTLRInputStream;
import org.antlr.runtime.CommonTokenStream; import org.antlr.runtime.CommonTokenStream;
import org.antlr.runtime.tree.CommonTreeNodeStream; import org.antlr.runtime.tree.CommonTreeNodeStream;
import de.dhbw.compiler.antlrxcompiler.XLexer;
import de.dhbw.compiler.antlrxcompiler.XOptimizer;
import de.dhbw.compiler.antlrxcompiler.XParser;
import de.dhbw.compiler.antlrxcompiler.XTree;
import de.dhbw.compiler.antlrxcompiler.XTreeAdaptor;
import de.dhbw.compiler.antlrxcompiler.XTypeCheck;
public abstract class OptimizerTest { public abstract class OptimizerTest {
protected void testTypeCheckTree(String in, String expected) throws Exception { protected void testTypeCheckTree(String in, String expected) throws Exception {
XTreeAdaptor xTreeAdaptor = new XTreeAdaptor(); XTreeAdaptor xTreeAdaptor = new XTreeAdaptor();
ANTLRInputStream input = new ANTLRInputStream(new ByteArrayInputStream(in.getBytes())); ANTLRInputStream input = new ANTLRInputStream(new ByteArrayInputStream(in.getBytes()));
XLexer scanner = new XLexer(input); XLexer scanner = new XLexer(input);
CommonTokenStream tokens = new CommonTokenStream(scanner); CommonTokenStream tokens = new CommonTokenStream(scanner);

2
CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/test/ParseTreeTest.java
View File

@@ -16,6 +16,7 @@ import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import de.dhbw.compiler.antlrxcompiler.XTreeAdaptor;
import org.antlr.runtime.ANTLRInputStream; import org.antlr.runtime.ANTLRInputStream;
import org.antlr.runtime.CommonTokenStream; import org.antlr.runtime.CommonTokenStream;
import org.antlr.runtime.ParserRuleReturnScope; import org.antlr.runtime.ParserRuleReturnScope;
@@ -23,7 +24,6 @@ import org.antlr.runtime.tree.CommonTree;
import de.dhbw.compiler.antlrxcompiler.XLexer; import de.dhbw.compiler.antlrxcompiler.XLexer;
import de.dhbw.compiler.antlrxcompiler.XParser; import de.dhbw.compiler.antlrxcompiler.XParser;
import de.dhbw.compiler.antlrxcompiler.XTreeAdaptor;
public abstract class ParseTreeTest { public abstract class ParseTreeTest {

9
CC-Praxis-Antlr X Uebersetzer-Leer/src/de/dhbw/compiler/antlrxcompiler/test/TypeCheckTest.java
View File

@@ -16,20 +16,15 @@ import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import de.dhbw.compiler.antlrxcompiler.*;
import org.antlr.runtime.ANTLRInputStream; import org.antlr.runtime.ANTLRInputStream;
import org.antlr.runtime.CommonTokenStream; import org.antlr.runtime.CommonTokenStream;
import org.antlr.runtime.tree.CommonTreeNodeStream; import org.antlr.runtime.tree.CommonTreeNodeStream;
import de.dhbw.compiler.antlrxcompiler.XLexer;
import de.dhbw.compiler.antlrxcompiler.XParser;
import de.dhbw.compiler.antlrxcompiler.XTree;
import de.dhbw.compiler.antlrxcompiler.XTreeAdaptor;
import de.dhbw.compiler.antlrxcompiler.XTypeCheck;
public abstract class TypeCheckTest { public abstract class TypeCheckTest {
protected void testTypeCheckTree(String in, String expected) throws Exception { protected void testTypeCheckTree(String in, String expected) throws Exception {
XTreeAdaptor xTreeAdaptor = new XTreeAdaptor(); XTreeAdaptor xTreeAdaptor = new XTreeAdaptor();
ANTLRInputStream input = new ANTLRInputStream(new ByteArrayInputStream(in.getBytes())); ANTLRInputStream input = new ANTLRInputStream(new ByteArrayInputStream(in.getBytes()));
XLexer scanner = new XLexer(input); XLexer scanner = new XLexer(input);
CommonTokenStream tokens = new CommonTokenStream(scanner); CommonTokenStream tokens = new CommonTokenStream(scanner);