diff --git a/src/de/dhbwstuttgart/core/MyCompilerAPI.java b/src/de/dhbwstuttgart/core/MyCompilerAPI.java index 6a192eb8..a8580c66 100755 --- a/src/de/dhbwstuttgart/core/MyCompilerAPI.java +++ b/src/de/dhbwstuttgart/core/MyCompilerAPI.java @@ -1,8 +1,5 @@ -// ino.module.MyCompilerAPI.8570.package package de.dhbwstuttgart.core; -// ino.end -// ino.module.MyCompilerAPI.8570.import import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -17,7 +14,6 @@ import de.dhbwstuttgart.typeinference.TypeinferenceResults; import de.dhbwstuttgart.typeinference.exceptions.ParserError; import de.dhbwstuttgart.typeinference.exceptions.TypeinferenceException; -// ino.class.MyCompilerAPI.21328.description type=javadoc /** * Schnittstellen-Klasse zum Compiler. Diese Klasse soll der * IDE als Compiler-API zum Kompilieren einer Quellcode-Datei @@ -26,24 +22,15 @@ import de.dhbwstuttgart.typeinference.exceptions.TypeinferenceException; * @author Jörg Bäuerle * @version $Date: 2013/09/09 11:04:24 $ */ -// ino.end -// ino.class.MyCompilerAPI.21328.declaration public interface MyCompilerAPI -// ino.end -// ino.class.MyCompilerAPI.21328.body { - // ino.method.init.21331.decldescription type=javadoc /** * Author: Jörg Bäuerle
* Initialisiert den Compiler */ - // ino.end - // ino.method.init.21331.declaration public void init(); - // ino.end - // ino.method.parse.21334.decldescription type=javadoc /** * Author: Jörg Bäuerle
* Parst eine Quellcodedatei und baut den abstrakten Syntaxbaum auf. @@ -52,13 +39,9 @@ public interface MyCompilerAPI * @throws IOException Wenn was schief läuft. * @throws JavaParser.yyException Wenn ein Fehler beim Parsen auftritt. */ - // ino.end - // ino.method.parse.21334.declaration public SourceFile parse(File file) throws FileNotFoundException, IOException, JavaParser.yyException; - // ino.end - // ino.method.parse.21337.decldescription type=javadoc /** * Author: Jörg Bäuerle
* Parst einen String und baut den abstrakten Syntaxbaum auf. @@ -66,14 +49,10 @@ public interface MyCompilerAPI * @throws IOException Wenn was schief läuft. * @throws JavaParser.yyException Wenn ein Fehler beim Parsen auftritt. - // ino.end - // ino.method.parse.21337.declaration public void parse(String srcCode) throws IOException, JavaParser.yyException; - // ino.end */ - // ino.method.typeReconstruction.21340.decldescription type=javadoc /** * Author: Jörg Bäuerle
* Ruft den Typrekonstruktionsalgorithmus auf. @@ -82,30 +61,19 @@ public interface MyCompilerAPI * ist. @throws CTypeReconstructionException Wenn ein Fehler bei der * Typrekonstruktion auftritt. */ - // ino.end - // ino.method.typeReconstruction.21340.declaration public Menge typeReconstruction(Menge m_AbstractSyntaxTree) throws NullPointerException; - // ino.end - // ino.method.setOutputDir.21349.decldescription type=javadoc /** * Author: Juergen Schmiing
* Legt das Ausgabeverzeichnis fuer die class-Files fest. */ - // ino.end - // ino.method.setOutputDir.21349.declaration public void setOutputDir(String dir); - // ino.end - // ino.method.getOutputDir.21352.decldescription type=javadoc /** * Author: Juergen Schmiing
* Gibt das Ausgabeverzeichnis fuer die class-Files zurueck. */ - // ino.end - // ino.method.getOutputDir.21352.declaration public String getOutputDir(); - // ino.end /** * Parst zusammenhängende JavaKlassen in verschiedenen Dateien. @@ -128,4 +96,3 @@ public interface MyCompilerAPI */ public Menge generateBytecode(Menge m_AbstractSyntaxTree, TypeinferenceResults typeinferenceResults); } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/Method.java b/src/de/dhbwstuttgart/syntaxtree/Method.java index e950def7..624e75c2 100755 --- a/src/de/dhbwstuttgart/syntaxtree/Method.java +++ b/src/de/dhbwstuttgart/syntaxtree/Method.java @@ -1,4 +1,3 @@ -// ino.module.Method.8564.package package de.dhbwstuttgart.syntaxtree; import java.sql.Ref; @@ -31,7 +30,6 @@ import de.dhbwstuttgart.typeinference.assumptions.MethodAssumption; import de.dhbwstuttgart.typeinference.assumptions.ParameterAssumption; import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions; -// ino.class.Method.23482.declaration /** * Stellt eine Methode dar. Problem: Parser kann nicht zwischen Methode und * Konstruktor unterscheiden. Daher kann diese Klasse beides sein. Dies wird mit diff --git a/src/de/dhbwstuttgart/syntaxtree/SourceFile.java b/src/de/dhbwstuttgart/syntaxtree/SourceFile.java index 69b2091d..ecf1a692 100755 --- a/src/de/dhbwstuttgart/syntaxtree/SourceFile.java +++ b/src/de/dhbwstuttgart/syntaxtree/SourceFile.java @@ -317,12 +317,9 @@ public class SourceFile extends SyntaxTreeNode{ * TODO: Diese Methode neu erstellen */ public TypeAssumptions makeBasicAssumptionsFromJRE(List imports, boolean withSubtypes) - // ino.end - // ino.method.makeBasicAssumptionsFromJRE.21409.body { return null; } - // ino.end private Class getSuperClassOfJREClass(java.lang.Class x, TypeAssumptions ass) { Class ret; @@ -347,14 +344,10 @@ public class SourceFile extends SyntaxTreeNode{ return ret; } - // ino.method.isBaseType.21412.definition private boolean isBaseType(String type) - // ino.end - // ino.method.isBaseType.21412.body { return baseTypeTranslationTable.containsValue(type); } - // ino.end /*Die contains Methode des Menges vergleicht bei Strings nicht korrekt, * da zwei Strings mit dem gleichen Inhalt unterschiedliche Instanzen sind. @@ -371,10 +364,7 @@ public class SourceFile extends SyntaxTreeNode{ } - // ino.method.createTypeFromJavaGenericType.21415.definition private Type createTypeFromJavaGenericType(java.lang.reflect.Type type, java.lang.Class cl, HashtablejreSpiderRegistry, Class parentClass) - // ino.end - // ino.method.createTypeFromJavaGenericType.21415.body { /* auskommentiert, da die Klassen von Sun in der Open JDK 1.8 nicht unterstützt werden. if(type instanceof TypeVariableImpl){ @@ -400,7 +390,6 @@ public class SourceFile extends SyntaxTreeNode{ //} } - // ino.method.getPackageName.21427.defdescription type=javadoc /** * Erzeugt f�r jede Klasse einen Menge, in den Referenzen auf die GenericTypeVars * dieser Klasse gespeichert werden. Diese Mengeen werden unter den Klassennamen @@ -426,21 +415,13 @@ public class SourceFile extends SyntaxTreeNode{ * } * } */ - // ino.end - // ino.method.getPackageName.21427.definition public UsedId getPackageName() - // ino.end - // ino.method.getPackageName.21427.body { return pkgName; } - // ino.end - // ino.method.setPackageName.21430.definition public void setPackageName(UsedId pkgName) - // ino.end - // ino.method.setPackageName.21430.body { this.pkgName = pkgName; @@ -451,7 +432,6 @@ public class SourceFile extends SyntaxTreeNode{ } } - // ino.end public ImportDeclarations getImports() { @@ -459,23 +439,15 @@ public class SourceFile extends SyntaxTreeNode{ } - // ino.method.getClassIterator.21439.definition public Iterator getClassIterator() - // ino.end - // ino.method.getClassIterator.21439.body { return KlassenVektor.iterator(); } - // ino.end - // ino.method.getInterfaceIterator.21442.definition public Iterator getInterfaceIterator() - // ino.end - // ino.method.getInterfaceIterator.21442.body { return InterfaceVektor.iterator(); } - // ino.end @Override diff --git a/src/de/dhbwstuttgart/syntaxtree/modifier/Final.java b/src/de/dhbwstuttgart/syntaxtree/modifier/Final.java index 03be2767..ac2a9372 100755 --- a/src/de/dhbwstuttgart/syntaxtree/modifier/Final.java +++ b/src/de/dhbwstuttgart/syntaxtree/modifier/Final.java @@ -1,30 +1,20 @@ -// ino.module.Final.8586.package package de.dhbwstuttgart.syntaxtree.modifier; import de.dhbwstuttgart.typeinference.JavaCodeResult; import de.dhbwstuttgart.typeinference.ResultSet; -// ino.class.Final.24022.description type=javadoc /** * Stellt den Modifier Final dar. * */ -// ino.end -// ino.class.Final.24022.declaration public class Final extends Modifier -// ino.end -// ino.class.Final.24022.body { - // ino.method.getBitmask.24026.definition public short getBitmask() - // ino.end - // ino.method.getBitmask.24026.body { return 0x10; } - // ino.end @Override public JavaCodeResult printJavaCode(ResultSet resultSet) { @@ -32,4 +22,3 @@ public class Final extends Modifier } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/modifier/Modifier.java b/src/de/dhbwstuttgart/syntaxtree/modifier/Modifier.java index 22bcda47..10a81651 100755 --- a/src/de/dhbwstuttgart/syntaxtree/modifier/Modifier.java +++ b/src/de/dhbwstuttgart/syntaxtree/modifier/Modifier.java @@ -1,25 +1,15 @@ -// ino.module.Modifier.8587.package package de.dhbwstuttgart.syntaxtree.modifier; import de.dhbwstuttgart.typeinference.JavaCodeResult; import de.dhbwstuttgart.typeinference.ResultSet; -// ino.end -// ino.class.Modifier.24029.declaration public abstract class Modifier -// ino.end -// ino.class.Modifier.24029.body { - // ino.method.getBitmask.24032.decldescription type=javadoc /** * Liefert den Wert des Access-Modifiers fuer die Bytecode-Generierung * zurueck. */ - // ino.end - // ino.method.getBitmask.24032.declaration public abstract short getBitmask(); - // ino.end public abstract JavaCodeResult printJavaCode(ResultSet resultSet); } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/modifier/Modifiers.java b/src/de/dhbwstuttgart/syntaxtree/modifier/Modifiers.java index b52c3df5..4dc5b890 100755 --- a/src/de/dhbwstuttgart/syntaxtree/modifier/Modifiers.java +++ b/src/de/dhbwstuttgart/syntaxtree/modifier/Modifiers.java @@ -1,8 +1,5 @@ -// ino.module.Modifiers.8588.package package de.dhbwstuttgart.syntaxtree.modifier; -// ino.end -// ino.module.Modifiers.8588.import import de.dhbwstuttgart.typeinference.Menge; import de.dhbwstuttgart.typeinference.JavaCodeResult; @@ -10,10 +7,8 @@ import de.dhbwstuttgart.typeinference.ResultSet; import java.util.ArrayList; import java.util.List; -// ino.end -// ino.class.Modifiers.24035.description type=javadoc /** * Die Klasse beinhaltet die Liste der Access-Modifier fuer eine Klasse, * Methode usw. diff --git a/src/de/dhbwstuttgart/syntaxtree/modifier/Private.java b/src/de/dhbwstuttgart/syntaxtree/modifier/Private.java index 913b5dad..600c25d0 100755 --- a/src/de/dhbwstuttgart/syntaxtree/modifier/Private.java +++ b/src/de/dhbwstuttgart/syntaxtree/modifier/Private.java @@ -1,24 +1,16 @@ -// ino.module.Private.8589.package package de.dhbwstuttgart.syntaxtree.modifier; import de.dhbwstuttgart.typeinference.JavaCodeResult; import de.dhbwstuttgart.typeinference.ResultSet; -// ino.class.Private.24059.declaration public class Private extends Modifier -// ino.end -// ino.class.Private.24059.body { - // ino.method.getBitmask.24063.definition public short getBitmask() - // ino.end - // ino.method.getBitmask.24063.body { return 2; } - // ino.end @Override public JavaCodeResult printJavaCode(ResultSet resultSet) { @@ -26,4 +18,3 @@ public class Private extends Modifier } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/modifier/Protected.java b/src/de/dhbwstuttgart/syntaxtree/modifier/Protected.java index bc6b6f23..88a885d6 100755 --- a/src/de/dhbwstuttgart/syntaxtree/modifier/Protected.java +++ b/src/de/dhbwstuttgart/syntaxtree/modifier/Protected.java @@ -1,24 +1,16 @@ -// ino.module.Protected.8590.package package de.dhbwstuttgart.syntaxtree.modifier; import de.dhbwstuttgart.typeinference.JavaCodeResult; import de.dhbwstuttgart.typeinference.ResultSet; -// ino.class.Protected.24066.declaration public class Protected extends Modifier -// ino.end -// ino.class.Protected.24066.body { - // ino.method.getBitmask.24070.definition public short getBitmask() - // ino.end - // ino.method.getBitmask.24070.body { return 4; } - // ino.end @Override public JavaCodeResult printJavaCode(ResultSet resultSet) { @@ -26,4 +18,3 @@ public class Protected extends Modifier } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/modifier/Public.java b/src/de/dhbwstuttgart/syntaxtree/modifier/Public.java index 52ca21ff..8c2c9cf4 100755 --- a/src/de/dhbwstuttgart/syntaxtree/modifier/Public.java +++ b/src/de/dhbwstuttgart/syntaxtree/modifier/Public.java @@ -1,24 +1,16 @@ -// ino.module.Public.8591.package package de.dhbwstuttgart.syntaxtree.modifier; import de.dhbwstuttgart.typeinference.JavaCodeResult; import de.dhbwstuttgart.typeinference.ResultSet; -// ino.class.Public.24073.declaration public class Public extends Modifier -// ino.end -// ino.class.Public.24073.body { - // ino.method.getBitmask.24077.definition public short getBitmask() - // ino.end - // ino.method.getBitmask.24077.body { return 1; } - // ino.end @Override public JavaCodeResult printJavaCode(ResultSet resultSet) { @@ -26,4 +18,3 @@ public class Public extends Modifier } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/modifier/Static.java b/src/de/dhbwstuttgart/syntaxtree/modifier/Static.java index 18402b76..15cba0cd 100755 --- a/src/de/dhbwstuttgart/syntaxtree/modifier/Static.java +++ b/src/de/dhbwstuttgart/syntaxtree/modifier/Static.java @@ -1,24 +1,16 @@ -// ino.module.Static.8592.package package de.dhbwstuttgart.syntaxtree.modifier; import de.dhbwstuttgart.typeinference.JavaCodeResult; import de.dhbwstuttgart.typeinference.ResultSet; -// ino.class.Static.24080.declaration public class Static extends Modifier -// ino.end -// ino.class.Static.24080.body { - // ino.method.getBitmask.24084.definition public short getBitmask() - // ino.end - // ino.method.getBitmask.24084.body { return 8; } - // ino.end @Override public JavaCodeResult printJavaCode(ResultSet resultSet) { @@ -26,4 +18,3 @@ public class Static extends Modifier } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/modifier/Strictfp.java b/src/de/dhbwstuttgart/syntaxtree/modifier/Strictfp.java index b9cdb1ef..b355eccc 100755 --- a/src/de/dhbwstuttgart/syntaxtree/modifier/Strictfp.java +++ b/src/de/dhbwstuttgart/syntaxtree/modifier/Strictfp.java @@ -1,20 +1,11 @@ -// ino.module.Public.8591.package package de.dhbwstuttgart.syntaxtree.modifier; -// ino.class.Public.24073.declaration public class Strictfp extends Modifier -// ino.end -// ino.class.Public.24073.body { - // ino.method.getBitmask.24077.definition public short getBitmask() - // ino.end - // ino.method.getBitmask.24077.body { return 2048; } - // ino.end } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/AddOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/AddOp.java index b91d7a76..2990a41b 100755 --- a/src/de/dhbwstuttgart/syntaxtree/operator/AddOp.java +++ b/src/de/dhbwstuttgart/syntaxtree/operator/AddOp.java @@ -1,7 +1,4 @@ -// ino.module.AddOp.8594.package package de.dhbwstuttgart.syntaxtree.operator; -// ino.end -// ino.module.AddOp.8594.import import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; @@ -37,19 +34,12 @@ import de.dhbwstuttgart.typeinference.exceptions.NotImplementedException; -// ino.class.AddOp.24088.declaration public abstract class AddOp extends Operator -// ino.end -// ino.class.AddOp.24088.body { - // ino.method.AddOp.24092.definition public AddOp(int offset, int variableLength) - // ino.end - // ino.method.AddOp.24092.body { super(offset,variableLength); } - // ino.end @Override protected Hashtable getOperatorTypes() { @@ -158,4 +148,3 @@ public abstract class AddOp extends Operator } } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/AndOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/AndOp.java index 0da0936d..f0e8fc7f 100755 --- a/src/de/dhbwstuttgart/syntaxtree/operator/AndOp.java +++ b/src/de/dhbwstuttgart/syntaxtree/operator/AndOp.java @@ -1,4 +1,3 @@ -// ino.module.AndOp.8595.package package de.dhbwstuttgart.syntaxtree.operator; import de.dhbwstuttgart.typeinference.Menge; @@ -14,20 +13,13 @@ import de.dhbwstuttgart.typeinference.ConstraintsSet; import de.dhbwstuttgart.typeinference.TypeinferenceResultSet; import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions; -// ino.class.AndOp.24101.declaration public class AndOp extends LogOp -// ino.end -// ino.class.AndOp.24101.body { - // ino.method.AndOp.24105.definition public AndOp(int offset, int variableLength) - // ino.end - // ino.method.AndOp.24105.body { super(offset,variableLength); } - // ino.end @Override public InstructionList genByteCode(ClassGenerator _cg, TypeinferenceResultSet rs, Binary operator) { @@ -37,4 +29,3 @@ public class AndOp extends LogOp } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/DivideOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/DivideOp.java index 3d90a71d..38e41aea 100755 --- a/src/de/dhbwstuttgart/syntaxtree/operator/DivideOp.java +++ b/src/de/dhbwstuttgart/syntaxtree/operator/DivideOp.java @@ -1,7 +1,4 @@ -// ino.module.DivideOp.8596.package package de.dhbwstuttgart.syntaxtree.operator; -// ino.end -// ino.module.DivideOp.8596.import import de.dhbwstuttgart.typeinference.Menge; import de.dhbwstuttgart.typeinference.exceptions.NotImplementedException; @@ -22,19 +19,12 @@ import de.dhbwstuttgart.syntaxtree.statement.Expr; -// ino.class.DivideOp.24108.declaration public class DivideOp extends MulOp -// ino.end -// ino.class.DivideOp.24108.body { - // ino.method.DivideOp.24112.definition public DivideOp(int offset, int variableLength) - // ino.end - // ino.method.DivideOp.24112.body { super(offset,variableLength); } - // ino.end ArithmeticInstruction getOperator(String returnType) { if(returnType.equals("java.lang.Integer")){ @@ -50,4 +40,3 @@ public class DivideOp extends MulOp } } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/EqualOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/EqualOp.java index 0b1bc8f2..e44e1b23 100755 --- a/src/de/dhbwstuttgart/syntaxtree/operator/EqualOp.java +++ b/src/de/dhbwstuttgart/syntaxtree/operator/EqualOp.java @@ -1,25 +1,15 @@ -// ino.module.EqualOp.8597.package package de.dhbwstuttgart.syntaxtree.operator; -// ino.end -// ino.module.EqualOp.8597.import import org.apache.bcel.generic.BranchInstruction; import org.apache.bcel.generic.IF_ICMPNE; -// ino.class.EqualOp.24118.declaration public class EqualOp extends RelOp -// ino.end -// ino.class.EqualOp.24118.body { - // ino.method.EqualOp.24122.definition public EqualOp(int offset, int variableLength) - // ino.end - // ino.method.EqualOp.24122.body { super(offset, variableLength); } - // ino.end @Override BranchInstruction getOperator() { @@ -27,4 +17,3 @@ public class EqualOp extends RelOp } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/GreaterEquOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/GreaterEquOp.java index 2c0f01a9..2fde722c 100755 --- a/src/de/dhbwstuttgart/syntaxtree/operator/GreaterEquOp.java +++ b/src/de/dhbwstuttgart/syntaxtree/operator/GreaterEquOp.java @@ -1,7 +1,4 @@ -// ino.module.GreaterEquOp.8598.package package de.dhbwstuttgart.syntaxtree.operator; -// ino.end -// ino.module.GreaterEquOp.8598.import import de.dhbwstuttgart.typeinference.Menge; import org.apache.bcel.generic.BranchInstruction; @@ -13,19 +10,12 @@ import de.dhbwstuttgart.syntaxtree.statement.Expr; -// ino.class.GreaterEquOp.24134.declaration public class GreaterEquOp extends RelOp -// ino.end -// ino.class.GreaterEquOp.24134.body { - // ino.method.GreaterEquOp.24138.definition public GreaterEquOp(int offset, int variableLength) - // ino.end - // ino.method.GreaterEquOp.24138.body { super(offset,variableLength); } - // ino.end @Override BranchInstruction getOperator() { @@ -33,4 +23,3 @@ public class GreaterEquOp extends RelOp } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/GreaterOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/GreaterOp.java index 0d7c4fcb..5d872b32 100755 --- a/src/de/dhbwstuttgart/syntaxtree/operator/GreaterOp.java +++ b/src/de/dhbwstuttgart/syntaxtree/operator/GreaterOp.java @@ -1,7 +1,4 @@ -// ino.module.GreaterOp.8599.package package de.dhbwstuttgart.syntaxtree.operator; -// ino.end -// ino.module.GreaterOp.8599.import import de.dhbwstuttgart.typeinference.Menge; import org.apache.bcel.generic.BranchInstruction; @@ -12,19 +9,12 @@ import de.dhbwstuttgart.syntaxtree.statement.Expr; -// ino.class.GreaterOp.24147.declaration public class GreaterOp extends RelOp -// ino.end -// ino.class.GreaterOp.24147.body { - // ino.method.GreaterOp.24151.definition public GreaterOp(int offset, int variableLength) - // ino.end - // ino.method.GreaterOp.24151.body { super(offset,variableLength); } - // ino.end @Override BranchInstruction getOperator() { @@ -32,4 +22,3 @@ public class GreaterOp extends RelOp } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/LessEquOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/LessEquOp.java index b284946e..e5002c8b 100755 --- a/src/de/dhbwstuttgart/syntaxtree/operator/LessEquOp.java +++ b/src/de/dhbwstuttgart/syntaxtree/operator/LessEquOp.java @@ -1,7 +1,4 @@ -// ino.module.LessEquOp.8600.package package de.dhbwstuttgart.syntaxtree.operator; -// ino.end -// ino.module.LessEquOp.8600.import import de.dhbwstuttgart.typeinference.Menge; import org.apache.bcel.generic.BranchInstruction; @@ -12,19 +9,12 @@ import de.dhbwstuttgart.syntaxtree.statement.Expr; -// ino.class.LessEquOp.24160.declaration public class LessEquOp extends RelOp -// ino.end -// ino.class.LessEquOp.24160.body { - // ino.method.LessEquOp.24164.definition public LessEquOp(int offset, int variableLength) - // ino.end - // ino.method.LessEquOp.24164.body { super(offset,variableLength); } - // ino.end @Override BranchInstruction getOperator() { @@ -32,4 +22,3 @@ public class LessEquOp extends RelOp } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/LessOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/LessOp.java index a1ba738e..25c8a899 100755 --- a/src/de/dhbwstuttgart/syntaxtree/operator/LessOp.java +++ b/src/de/dhbwstuttgart/syntaxtree/operator/LessOp.java @@ -1,7 +1,4 @@ -// ino.module.LessOp.8601.package package de.dhbwstuttgart.syntaxtree.operator; -// ino.end -// ino.module.LessOp.8601.import import de.dhbwstuttgart.typeinference.Menge; import org.apache.bcel.generic.BranchInstruction; import org.apache.bcel.generic.IF_ICMPGE; @@ -11,19 +8,12 @@ import de.dhbwstuttgart.syntaxtree.statement.Expr; -// ino.class.LessOp.24173.declaration public class LessOp extends RelOp -// ino.end -// ino.class.LessOp.24173.body { - // ino.method.LessOp.24177.definition public LessOp(int offset, int variableLength) - // ino.end - // ino.method.LessOp.24177.body { super(offset,variableLength); } - // ino.end @Override BranchInstruction getOperator() { @@ -31,4 +21,3 @@ public class LessOp extends RelOp } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/LogOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/LogOp.java index 76551143..0cb5c54c 100755 --- a/src/de/dhbwstuttgart/syntaxtree/operator/LogOp.java +++ b/src/de/dhbwstuttgart/syntaxtree/operator/LogOp.java @@ -1,7 +1,4 @@ -// ino.module.LogOp.8602.package package de.dhbwstuttgart.syntaxtree.operator; -// ino.end -// ino.module.LogOp.8602.import import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; @@ -22,20 +19,13 @@ import de.dhbwstuttgart.typeinference.unify.TypeUnify; -// ino.class.LogOp.24186.declaration public abstract class LogOp extends Operator -// ino.end -// ino.class.LogOp.24186.body { - // ino.method.LogOp.24190.definition public LogOp(int offset, int variableLength) - // ino.end - // ino.method.LogOp.24190.body { super(offset, variableLength); } - // ino.end @@ -57,4 +47,3 @@ public abstract class LogOp extends Operator } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/MinusOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/MinusOp.java index 5a342e99..afb6bdcf 100755 --- a/src/de/dhbwstuttgart/syntaxtree/operator/MinusOp.java +++ b/src/de/dhbwstuttgart/syntaxtree/operator/MinusOp.java @@ -1,7 +1,4 @@ -// ino.module.MinusOp.8603.package package de.dhbwstuttgart.syntaxtree.operator; -// ino.end -// ino.module.MinusOp.8603.import import de.dhbwstuttgart.typeinference.Menge; import org.apache.bcel.generic.ArithmeticInstruction; @@ -13,22 +10,14 @@ import de.dhbwstuttgart.syntaxtree.statement.Expr; -// ino.class.MinusOp.24211.declaration public class MinusOp extends AddOp -// ino.end -// ino.class.MinusOp.24211.body { - // ino.method.MinusOp.24215.definition public MinusOp(int offset, int variableLength) - // ino.end - // ino.method.MinusOp.24215.body { super(offset,variableLength); } - // ino.end ArithmeticInstruction getOperator(String returnType) { return new ISUB(); } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/ModuloOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/ModuloOp.java index 4a13c657..91d1139e 100755 --- a/src/de/dhbwstuttgart/syntaxtree/operator/ModuloOp.java +++ b/src/de/dhbwstuttgart/syntaxtree/operator/ModuloOp.java @@ -9,19 +9,12 @@ import de.dhbwstuttgart.syntaxtree.statement.Expr; -// ino.class.ModuloOp.24221.declaration public class ModuloOp extends MulOp -// ino.end -// ino.class.ModuloOp.24221.body { - // ino.method.ModuloOp.24225.definition public ModuloOp(int offset, int variableLength) - // ino.end - // ino.method.ModuloOp.24225.body { super(offset,variableLength); } - // ino.end @Override ArithmeticInstruction getOperator(String returnType) { @@ -29,4 +22,3 @@ public class ModuloOp extends MulOp } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/MulOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/MulOp.java index 14d0948f..31bf8843 100755 --- a/src/de/dhbwstuttgart/syntaxtree/operator/MulOp.java +++ b/src/de/dhbwstuttgart/syntaxtree/operator/MulOp.java @@ -1,8 +1,5 @@ -// ino.module.MulOp.8605.package package de.dhbwstuttgart.syntaxtree.operator; -// ino.end -// ino.module.MulOp.8605.import import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; @@ -30,19 +27,12 @@ import de.dhbwstuttgart.typeinference.exceptions.DebugException; import de.dhbwstuttgart.typeinference.unify.TypeUnify; import de.dhbwstuttgart.typeinference.exceptions.NotImplementedException; -// ino.class.MulOp.24231.declaration public abstract class MulOp extends Operator -// ino.end -// ino.class.MulOp.24231.body { - // ino.method.MulOp.24235.definition public MulOp(int offset, int variableLength) - // ino.end - // ino.method.MulOp.24235.body { super(offset, variableLength); } - // ino.end @Override protected Hashtable getOperatorTypes() { @@ -121,4 +111,3 @@ public abstract class MulOp extends Operator } } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/NotEqualOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/NotEqualOp.java index 37e22386..15cfb073 100755 --- a/src/de/dhbwstuttgart/syntaxtree/operator/NotEqualOp.java +++ b/src/de/dhbwstuttgart/syntaxtree/operator/NotEqualOp.java @@ -1,7 +1,4 @@ -// ino.module.NotEqualOp.8606.package package de.dhbwstuttgart.syntaxtree.operator; -// ino.end -// ino.module.NotEqualOp.8606.import import java.util.Iterator; import de.dhbwstuttgart.syntaxtree.statement.Binary; @@ -14,19 +11,12 @@ import org.apache.bcel.generic.BranchInstruction; import org.apache.bcel.generic.IF_ACMPEQ; -// ino.class.NotEqualOp.24241.declaration public class NotEqualOp extends RelOp -// ino.end -// ino.class.NotEqualOp.24241.body { - // ino.method.NotEqualOp.24245.definition public NotEqualOp(int offset, int variableLength) - // ino.end - // ino.method.NotEqualOp.24245.body { super(offset,variableLength); } - // ino.end @Override BranchInstruction getOperator() { @@ -34,4 +24,3 @@ public class NotEqualOp extends RelOp } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/Operator.java b/src/de/dhbwstuttgart/syntaxtree/operator/Operator.java index b4ef10a1..f7c6da0c 100755 --- a/src/de/dhbwstuttgart/syntaxtree/operator/Operator.java +++ b/src/de/dhbwstuttgart/syntaxtree/operator/Operator.java @@ -1,7 +1,4 @@ -// ino.module.Operator.8607.package package de.dhbwstuttgart.syntaxtree.operator; -// ino.end -// ino.module.Operator.8607.import import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; @@ -102,4 +99,3 @@ public abstract class Operator extends SyntaxTreeNode return il; } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/OrOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/OrOp.java index 457ff978..321c39b6 100755 --- a/src/de/dhbwstuttgart/syntaxtree/operator/OrOp.java +++ b/src/de/dhbwstuttgart/syntaxtree/operator/OrOp.java @@ -1,6 +1,4 @@ -// ino.module.OrOp.8608.package package de.dhbwstuttgart.syntaxtree.operator; -// ino.end import org.apache.bcel.Constants; import org.apache.bcel.generic.BranchInstruction; @@ -16,20 +14,13 @@ import de.dhbwstuttgart.bytecode.DHBWInstructionFactory; import de.dhbwstuttgart.syntaxtree.statement.Binary; import de.dhbwstuttgart.typeinference.TypeinferenceResultSet; -// ino.class.OrOp.24282.declaration public class OrOp extends LogOp -// ino.end -// ino.class.OrOp.24282.body { - // ino.method.OrOp.24286.definition public OrOp(int offset, int variableLength) - // ino.end - // ino.method.OrOp.24286.body { super(offset,variableLength); } - // ino.end @Override public InstructionList genByteCode(ClassGenerator _cg, TypeinferenceResultSet rs, Binary operator) { @@ -73,4 +64,3 @@ public class OrOp extends LogOp } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/PlusOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/PlusOp.java index 099f1ab7..253a6b7a 100755 --- a/src/de/dhbwstuttgart/syntaxtree/operator/PlusOp.java +++ b/src/de/dhbwstuttgart/syntaxtree/operator/PlusOp.java @@ -1,7 +1,4 @@ -// ino.module.PlusOp.8609.package package de.dhbwstuttgart.syntaxtree.operator; -// ino.end -// ino.module.PlusOp.8609.import import de.dhbwstuttgart.typeinference.Menge; import de.dhbwstuttgart.typeinference.TypeinferenceResultSet; import de.dhbwstuttgart.typeinference.exceptions.NotImplementedException; @@ -30,19 +27,12 @@ import de.dhbwstuttgart.syntaxtree.type.Type; -// ino.class.PlusOp.24289.declaration public class PlusOp extends AddOp -// ino.end -// ino.class.PlusOp.24289.body { - // ino.method.PlusOp.24293.definition public PlusOp(int offset, int variableLength) - // ino.end - // ino.method.PlusOp.24293.body { super(offset,variableLength); } - // ino.end ArithmeticInstruction getOperator(String returnType) { if(returnType.equals("java.lang.Integer")){ @@ -58,4 +48,3 @@ public class PlusOp extends AddOp } } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/RelOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/RelOp.java index 8325d627..b38b7f82 100755 --- a/src/de/dhbwstuttgart/syntaxtree/operator/RelOp.java +++ b/src/de/dhbwstuttgart/syntaxtree/operator/RelOp.java @@ -1,8 +1,5 @@ -// ino.module.RelOp.8610.package package de.dhbwstuttgart.syntaxtree.operator; -// ino.end -// ino.module.RelOp.8610.import import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; @@ -25,19 +22,12 @@ import de.dhbwstuttgart.typeinference.TypeinferenceResultSet; import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions; import de.dhbwstuttgart.typeinference.exceptions.DebugException; import de.dhbwstuttgart.typeinference.unify.TypeUnify; -// ino.class.RelOp.24299.declaration public abstract class RelOp extends Operator -// ino.end -// ino.class.RelOp.24299.body { - // ino.method.RelOp.24303.definition public RelOp(int offset, int variableLength) - // ino.end - // ino.method.RelOp.24303.body { super(offset, variableLength); } - // ino.end protected Hashtable getOperatorTypes() { @@ -103,4 +93,3 @@ public abstract class RelOp extends Operator abstract BranchInstruction getOperator(); } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/operator/TimesOp.java b/src/de/dhbwstuttgart/syntaxtree/operator/TimesOp.java index a2b77319..2a9568a5 100755 --- a/src/de/dhbwstuttgart/syntaxtree/operator/TimesOp.java +++ b/src/de/dhbwstuttgart/syntaxtree/operator/TimesOp.java @@ -1,8 +1,5 @@ -// ino.module.TimesOp.8611.package package de.dhbwstuttgart.syntaxtree.operator; -// ino.end -// ino.module.TimesOp.8611.import import de.dhbwstuttgart.typeinference.Menge; import de.dhbwstuttgart.typeinference.exceptions.NotImplementedException; @@ -15,19 +12,12 @@ import org.apache.bcel.generic.LMUL; import de.dhbwstuttgart.syntaxtree.statement.Binary; import de.dhbwstuttgart.syntaxtree.statement.Expr; -// ino.class.TimesOp.24312.declaration public class TimesOp extends MulOp -// ino.end -// ino.class.TimesOp.24312.body { - // ino.method.TimesOp.24316.definition public TimesOp(int offset,int variableLength) - // ino.end - // ino.method.TimesOp.24316.body { super(offset,variableLength); } - // ino.end ArithmeticInstruction getOperator(String returnType) { if(returnType.equals("java.lang.Integer")){ @@ -44,4 +34,3 @@ public class TimesOp extends MulOp } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Assign.java b/src/de/dhbwstuttgart/syntaxtree/statement/Assign.java index 17409537..7adf7392 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/Assign.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/Assign.java @@ -75,30 +75,20 @@ public class Assign extends ExprStmt - // ino.method.toString.24960.defdescription type=javadoc /** *
Author: Martin Pl�micke * @return */ - // ino.end - // ino.method.toString.24960.definition public String toString() - // ino.end - // ino.method.toString.24960.body { if(getType() == null)return "(" + expr1.toString() + " = " + expr2.toString() + ")"; return getType().toString() + "(" + expr1.toString() + " = " + expr2.toString() + ")"; } - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.24963.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.24963.body { } - // ino.end /* @Override @@ -160,4 +150,3 @@ public class Assign extends ExprStmt } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Binary.java b/src/de/dhbwstuttgart/syntaxtree/statement/Binary.java index 31526d94..165c81f1 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/Binary.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/Binary.java @@ -1,7 +1,4 @@ -// ino.module.Binary.8623.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.Binary.8623.import import java.util.HashMap; import org.apache.bcel.generic.ClassGen; @@ -23,127 +20,77 @@ import de.dhbwstuttgart.typeinference.UndConstraint; import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions; -// ino.class.Binary.24966.description type=line // neu von Felix -// ino.end -// ino.class.Binary.24966.declaration public class Binary extends BinaryExpr -// ino.end -// ino.class.Binary.24966.body { - // ino.method.Binary.24970.definition public Binary(int offset, int variableLength) - // ino.end - // ino.method.Binary.24970.body { super(offset,variableLength); } - // ino.end - // ino.attribute.parserlog.24973.decldescription type=javadoc /** * Logger: log4j */ - // ino.end - // ino.attribute.parserlog.24973.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.attribute.expr1.24976.declaration public Expr expr1; - // ino.end - // ino.attribute.op.24979.declaration public Operator op; - // ino.end - // ino.attribute.expr2.24982.declaration public Expr expr2; - // ino.end - // ino.method.set_Expr1.24988.definition public void set_Expr1(Expr exp) - // ino.end - // ino.method.set_Expr1.24988.body { this.expr1=exp; } - // ino.end - // ino.method.set_Expr2.24991.definition public void set_Expr2(Expr exp) - // ino.end - // ino.method.set_Expr2.24991.body { this.expr2=exp; } - // ino.end - // ino.method.set_Operator.24994.definition public void set_Operator(Operator Op) - // ino.end - // ino.method.set_Operator.24994.body { this.op=Op; } - // ino.end - // ino.method.get_Name.24997.definition public String get_Name() - // ino.end - // ino.method.get_Name.24997.body { return null; } - // ino.end - // ino.method.get_Operator.25000.definition public Operator get_Operator() - // ino.end - // ino.method.get_Operator.25000.body { return op; } - // ino.end - // ino.method.get_Expr1.25003.definition public Expr get_Expr1() - // ino.end - // ino.method.get_Expr1.25003.body { return expr1; } - // ino.end - // ino.method.get_Expr2.25006.definition public Expr get_Expr2() - // ino.end - // ino.method.get_Expr2.25006.body { return expr2; } - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25027.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25027.body { } @@ -206,4 +153,3 @@ public JavaCodeResult printJavaCode(ResultSet resultSet) { } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.java b/src/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.java index 561803d3..503bff68 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.java @@ -1,28 +1,19 @@ -// ino.module.BinaryExpr.8624.package package de.dhbwstuttgart.syntaxtree.statement; import de.dhbwstuttgart.typeinference.ConstraintsSet; import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions; -// ino.class.BinaryExpr.25030.declaration public abstract class BinaryExpr extends Expr -// ino.end -// ino.class.BinaryExpr.25030.body { - // ino.method.BinaryExpr.25034.definition public BinaryExpr(int offset,int variableLength) - // ino.end - // ino.method.BinaryExpr.25034.body { super(offset,variableLength); } - // ino.end // abstract public void if_codegen(ClassFile classfile, Code_attribute code, boolean sw) throws jvmCode_Exception; // abstract public void not_codegen(ClassFile classfile, Code_attribute code) throws jvmCode_Exception; } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Block.java b/src/de/dhbwstuttgart/syntaxtree/statement/Block.java index 17bb9150..02477b9c 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/Block.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/Block.java @@ -1,7 +1,4 @@ -// ino.module.Block.8625.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.Block.8625.import import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; @@ -37,10 +34,7 @@ import de.dhbwstuttgart.typeinference.exceptions.TypeinferenceException; -// ino.class.Block.25037.declaration public class Block extends Statement -// ino.end -// ino.class.Block.25037.body { private InstructionFactory _factory; private ConstantPoolGen _cp; @@ -52,30 +46,21 @@ public class Block extends Statement } - // ino.attribute.parserlog.25044.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end public List statements = new Menge(); //private String sc_meth_ret_type; - // ino.attribute.inferencelog.25059.decldescription type=javadoc /** * Logger: log4j */ - // ino.end - // ino.attribute.inferencelog.25059.declaration protected static Logger inferencelog = Logger.getLogger("inference"); - // ino.end protected static Logger typinferenceLog = Logger.getLogger("Typeinference"); - // ino.method.get_Statement.25065.definition public List get_Statement() - // ino.end - // ino.method.get_Statement.25065.body { return statements; } @@ -86,20 +71,14 @@ public class Block extends Statement - // ino.method.toString.25083.defdescription type=javadoc /** *
Author: Martin Pl�micke * @return */ - // ino.end - // ino.method.toString.25083.definition public String toString() - // ino.end - // ino.method.toString.25083.body { return this.type + " { " + statements.toString(); } - // ino.end @Override public ConstraintsSet TYPEStmt(TypeAssumptions assumptions) { @@ -206,6 +185,5 @@ public class Block extends Statement return il; } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.java index 8f96a203..80c37093 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.java @@ -1,7 +1,4 @@ -// ino.module.BoolLiteral.8626.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.BoolLiteral.8626.import import java.util.Hashtable; import org.apache.bcel.generic.ClassGen; @@ -26,27 +23,17 @@ import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions; -// ino.class.BoolLiteral.25089.declaration public class BoolLiteral extends Literal -// ino.end -// ino.class.BoolLiteral.25089.body { - // ino.attribute.Bool.25093.declaration private boolean Bool; - // ino.end - // ino.attribute.parserlog.25096.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.BoolLiteral.25099.definition public BoolLiteral() - // ino.end - // ino.method.BoolLiteral.25099.body { super(-1,-1); // #JB# 20.04.2005 @@ -55,43 +42,30 @@ public class BoolLiteral extends Literal //this.setType(new Type("boolean")); // ########################################################### } - // ino.end /* - // ino.method.sc_check.25102.definition public void sc_check(Menge classname, Hashtable ch, Hashtable bh, boolean ext, Hashtable parach,Hashtable parabh) - // ino.end - // ino.method.sc_check.25102.body { if(ext) { parserlog.debug(" ---BoolLiteral---"); } } - // ino.end */ - // ino.method.set_Bool.25105.definition public void set_Bool(boolean b) - // ino.end - // ino.method.set_Bool.25105.body { this.Bool = b; } - // ino.end - // ino.method.get_Name.25108.definition public String get_Name() - // ino.end - // ino.method.get_Name.25108.body { return null; } - // ino.end @@ -132,4 +106,3 @@ public class BoolLiteral extends Literal } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/CastExpr.java b/src/de/dhbwstuttgart/syntaxtree/statement/CastExpr.java index cb7d499d..c742a844 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/CastExpr.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/CastExpr.java @@ -1,7 +1,4 @@ -// ino.module.CastExpr.8627.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.CastExpr.8627.import import java.util.Hashtable; import java.util.Iterator; @@ -25,75 +22,46 @@ import de.dhbwstuttgart.typeinference.exceptions.NotImplementedException; -// ino.class.CastExpr.25126.declaration public class CastExpr extends Expr -// ino.end -// ino.class.CastExpr.25126.body { - // ino.method.CastExpr.25130.definition public CastExpr(Type castType, Expr expr,int offset) - // ino.end - // ino.method.CastExpr.25130.body { super(offset); this.type = castType; } - // ino.end - // ino.attribute.type.25133.declaration private Type type; - // ino.end - // ino.attribute.expr.25136.declaration public Expr expr; - // ino.end - // ino.attribute.parserlog.25139.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.get_Name.25145.definition public String get_Name() - // ino.end - // ino.method.get_Name.25145.body { return null; } - // ino.end - // ino.method.set_Type.25148.definition public void set_Type(Type ty) - // ino.end - // ino.method.set_Type.25148.body { this.type = ty; } - // ino.end - // ino.method.set_Expr.25151.definition public void set_Expr(Expr ex) - // ino.end - // ino.method.set_Expr.25151.body { this.expr = ex; } - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25163.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25163.body { } - // ino.end @@ -127,4 +95,3 @@ public class CastExpr extends Expr } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.java index 36eca183..2c882525 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.java @@ -1,7 +1,4 @@ -// ino.module.CharLiteral.8628.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.CharLiteral.8628.import import java.util.Hashtable; import org.apache.bcel.generic.BIPUSH; @@ -26,23 +23,13 @@ import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions; -// ino.class.CharLiteral.25166.declaration public class CharLiteral extends Literal -// ino.end -// ino.class.CharLiteral.25166.body { - // ino.attribute.Char.25170.declaration private char Char; - // ino.end - // ino.attribute.parserlog.25173.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.CharLiteral.25176.definition public CharLiteral() - // ino.end - // ino.method.CharLiteral.25176.body { super(-1,-1); // #JB# 20.04.2005 @@ -51,39 +38,26 @@ public class CharLiteral extends Literal //this.setType(new Type("char")); // ########################################################### } - // ino.end /* - // ino.method.sc_check.25179.definition public void sc_check(Menge classname, Hashtable ch, Hashtable bh, boolean ext, Hashtable parach, Hashtable parabh) - // ino.end - // ino.method.sc_check.25179.body { if(ext) parserlog.debug(" ---CharLiteral---"); } - // ino.end */ - // ino.method.set_Char.25182.definition public void set_Char( char c) - // ino.end - // ino.method.set_Char.25182.body { this.Char = c ; } - // ino.end - // ino.method.get_Name.25185.definition public String get_Name() - // ino.end - // ino.method.get_Name.25185.body { return null; } - // ino.end @Override @@ -115,8 +89,6 @@ public class CharLiteral extends Literal //Char-Getter fuer genByteCode public char get_Char() - // ino.end - // ino.method.get_Int.25463.body { return Char; } @@ -130,4 +102,3 @@ public class CharLiteral extends Literal return il; } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.java index d3fd8e55..e8a1bc54 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.java @@ -1,7 +1,4 @@ -// ino.module.IntLiteral.8635.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.IntLiteral.8635.import import java.util.Hashtable; import org.apache.bcel.generic.BIPUSH; @@ -29,91 +26,54 @@ import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions; -// ino.class.IntLiteral.25447.declaration public class DoubleLiteral extends Literal -// ino.end -// ino.class.IntLiteral.25447.body { - // ino.attribute.Int.25451.declaration private double Double; - // ino.end - // ino.attribute.parserlog.25454.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.IntLiteral.25457.definition public DoubleLiteral() - // ino.end - // ino.method.IntLiteral.25457.body { super(-1,-1); this.setType(new RefType("Double",this,this.getOffset())); } - // ino.end - // ino.method.set_Int.25460.definition public void set_Double(double i) - // ino.end - // ino.method.set_Int.25460.body { this.Double = i; } - // ino.end - // ino.method.get_Int.25463.definition public double get_Double() - // ino.end - // ino.method.get_Int.25463.body { return Double; } - // ino.end /* - // ino.method.sc_check.25466.definition public void sc_check(Menge classname, Hashtable ch, Hashtable bh, boolean ext, Hashtable parach, Hashtable parabh) - // ino.end - // ino.method.sc_check.25466.body { parserlog.debug("SC -> Semantik-Check f�r DoubleLiteral wurde aufgerufen --> nichts zu tun!"); } - // ino.end */ - // ino.method.get_Name.25469.definition public String get_Name() - // ino.end - // ino.method.get_Name.25469.body { return null; } - // ino.end - // ino.method.toString.25484.defdescription type=javadoc /** *
Author: Martin Pl�micke * @return */ - // ino.end - // ino.method.toString.25484.definition public String toString() - // ino.end - // ino.method.toString.25484.body { return type.toString() + " " + Double; } - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25487.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25487.body { } - // ino.end @Override public ConstraintsSet TYPEExpr(TypeAssumptions assumptions) { @@ -154,4 +114,3 @@ public JavaCodeResult printJavaCode(ResultSet resultSet) { } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.java b/src/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.java index 0eff5b0f..0da51a5e 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.java @@ -1,7 +1,4 @@ -// ino.module.EmptyStmt.8629.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.EmptyStmt.8629.import import java.util.Hashtable; import org.apache.bcel.generic.ClassGen; @@ -24,45 +21,28 @@ import de.dhbwstuttgart.typeinference.exceptions.NotImplementedException; -// ino.class.EmptyStmt.25203.declaration public class EmptyStmt extends Statement -// ino.end -// ino.class.EmptyStmt.25203.body { - // ino.method.EmptyStmt.25207.definition public EmptyStmt() - // ino.end - // ino.method.EmptyStmt.25207.body { super(-1,-1); } - // ino.end - // ino.attribute.parserlog.25210.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end /* - // ino.method.sc_check.25213.definition public void sc_check(Menge classlist, Hashtable ch, Hashtable bh, boolean ext, Hashtable parach, Hashtable parabh) - // ino.end - // ino.method.sc_check.25213.body { if(ext){ parserlog.debug(" ---EmptyStmt---"); } } - // ino.end */ - // ino.method.wandleRefTypeAttributes2GenericAttributes.25222.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25222.body { } - // ino.end @Override @@ -93,4 +73,3 @@ public class EmptyStmt extends Statement } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.java index 3a2c5e15..83c59649 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.java @@ -1,7 +1,4 @@ -// ino.module.IntLiteral.8635.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.IntLiteral.8635.import import java.util.Hashtable; import org.apache.bcel.generic.ClassGen; @@ -27,92 +24,55 @@ import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions; -// ino.class.IntLiteral.25447.declaration public class FloatLiteral extends Literal -// ino.end -// ino.class.IntLiteral.25447.body { - // ino.attribute.Int.25451.declaration private float Float; - // ino.end - // ino.attribute.parserlog.25454.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.IntLiteral.25457.definition public FloatLiteral() - // ino.end - // ino.method.IntLiteral.25457.body { super(-1,-1); this.setType(new RefType("Float",this,this.getOffset())); } - // ino.end - // ino.method.set_Int.25460.definition public void set_Float(float i) - // ino.end - // ino.method.set_Int.25460.body { this.Float = i; } - // ino.end - // ino.method.get_Int.25463.definition public float get_Float() - // ino.end - // ino.method.get_Int.25463.body { return Float; } - // ino.end /* - // ino.method.sc_check.25466.definition public void sc_check(Menge classname, Hashtable ch, Hashtable bh, boolean ext, Hashtable parach, Hashtable parabh) - // ino.end - // ino.method.sc_check.25466.body { parserlog.debug("SC -> Semantik-Check f�r FloatLiteral wurde aufgerufen --> nichts zu tun!"); } - // ino.end */ - // ino.method.get_Name.25469.definition public String get_Name() - // ino.end - // ino.method.get_Name.25469.body { return null; } - // ino.end - // ino.method.toString.25484.defdescription type=javadoc /** *
Author: Martin Pl�micke * @return */ - // ino.end - // ino.method.toString.25484.definition public String toString() - // ino.end - // ino.method.toString.25484.body { return type.toString() + " " + Float; } - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25487.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25487.body { } - // ino.end @Override public ConstraintsSet TYPEExpr(TypeAssumptions assumptions) { @@ -141,4 +101,3 @@ public JavaCodeResult printJavaCode(ResultSet resultSet) { return il; } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java b/src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java index dbf4a4fb..9f6c4025 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java @@ -1,7 +1,4 @@ -// ino.module.IfStmt.8632.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.IfStmt.8632.import import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; @@ -48,73 +45,41 @@ import de.dhbwstuttgart.typeinference.unify.TypeUnify; -// ino.class.IfStmt.25300.declaration public class IfStmt extends Statement -// ino.end -// ino.class.IfStmt.25300.body { - // ino.method.IfStmt.25304.definition public IfStmt(int offset, int variableLength) - // ino.end - // ino.method.IfStmt.25304.body { super(offset,variableLength); } - // ino.end - // ino.attribute.hamaDebug.25307.declaration public boolean hamaDebug = true; //hama: Debug Ausgaben von mir ein- bzw. ausschalten - // ino.end - // ino.attribute.expr.25310.declaration public Expr expr; - // ino.end - // ino.attribute.then_block.25313.declaration public Statement then_block; - // ino.end - // ino.attribute.else_block.25316.declaration public Statement else_block; - // ino.end - // ino.attribute.parserlog.25319.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.set_Expr.25322.definition public void set_Expr(Expr exp) - // ino.end - // ino.method.set_Expr.25322.body { this.expr = exp; } - // ino.end - // ino.method.set_Then_block.25325.definition public void set_Then_block(Statement blk) - // ino.end - // ino.method.set_Then_block.25325.body { this.then_block = blk; } - // ino.end - // ino.method.set_Else_block.25328.definition public void set_Else_block(Statement blk) - // ino.end - // ino.method.set_Else_block.25328.body { this.else_block = blk; } - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25349.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25349.body { if(then_block!=null){ then_block.wandleRefTypeAttributes2GenericAttributes(paralist,genericMethodParameters); @@ -124,7 +89,6 @@ public class IfStmt extends Statement } } - // ino.end @Override @@ -196,4 +160,3 @@ public class IfStmt extends Statement return il; } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/InstVar.java b/src/de/dhbwstuttgart/syntaxtree/statement/InstVar.java index 43636f28..ae55a6a7 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/InstVar.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/InstVar.java @@ -1,7 +1,4 @@ -// ino.module.InstVar.8634.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.InstVar.8634.import import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; @@ -34,60 +31,36 @@ import de.dhbwstuttgart.typeinference.unify.TypeUnify; -// ino.class.InstVar.25392.declaration public class InstVar extends Expr -// ino.end -// ino.class.InstVar.25392.body { - // ino.attribute.expr.25396.declaration private Expr expr; - // ino.end - // ino.attribute.usedid.25399.declaration private UsedId usedid; - // ino.end - // ino.attribute.type.25402.declaration protected String type; //???? BRAUCHT MAN DEN??? - // ino.end - // ino.attribute.parserlog.25405.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.InstVar.25408.definition public InstVar(Expr e, String n, int offset) - // ino.end - // ino.method.InstVar.25408.body { super(offset,n.length()); expr = e; usedid = new UsedId(getOffset()); usedid.set_Name(n); } - // ino.end - // ino.method.InstVar.25411.definition public InstVar(String n, String t, int offset) - // ino.end - // ino.method.InstVar.25411.body { super(offset,n.length()); usedid = new UsedId(getOffset()); usedid.set_Name(n); type = t; } - // ino.end - // ino.method.InstVar.25414.defdescription type=javadoc /** * macht aus einem UsedId mit einem Menge von Strings eine InstVar *
Author: Martin Pl�micke PL 05-08-17 * @param ui * @return */ - // ino.end - // ino.method.InstVar.25414.definition public InstVar(UsedId ui, int offset,int variableLength) - // ino.end - // ino.method.InstVar.25414.body { super(offset,variableLength); Iterator namen = ui.get_Name().iterator(); @@ -102,7 +75,6 @@ public class InstVar extends Expr expr = INSTVA.expr; usedid = INSTVA.usedid; } - // ino.end @Override public void parserPostProcessing(SyntaxTreeNode parent) { @@ -111,10 +83,7 @@ public class InstVar extends Expr } /* - // ino.method.sc_check.25417.definition public void sc_check(Menge classname, Hashtable ch, Hashtable bh, boolean ext, Hashtable parach, Hashtable parabh) - // ino.end - // ino.method.sc_check.25417.body { if(ext) parserlog.debug(" ---InstVar---"); @@ -141,25 +110,15 @@ public class InstVar extends Expr parserlog.debug("Typfehler: -->InstVar.sc_check() "+ name1); } } - // ino.end */ - // ino.method.get_Name.25420.definition public String get_Name() - // ino.end - // ino.method.get_Name.25420.body { return this.usedid.get_Name_1Element(); } - // ino.end - // ino.method.get_codegen_UsedId.25423.definition public String get_codegen_UsedId() - // ino.end - // ino.method.get_codegen_UsedId.25423.body { return usedid.get_codegen_UsedId(); } - // ino.end - // ino.method.toString.25441.defdescription type=javadoc /** *
Author: Martin Pl�micke * @return @@ -214,4 +173,3 @@ public class InstVar extends Expr throw new NotImplementedException(); } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java b/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java index 6c3a0278..dcebe59c 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java @@ -1,7 +1,4 @@ -// ino.module.InstanceOf.8633.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.InstanceOf.8633.import import java.util.Enumeration; import java.util.Hashtable; @@ -25,29 +22,15 @@ import de.dhbwstuttgart.typeinference.exceptions.NotImplementedException; -// ino.class.InstanceOf.25352.declaration public class InstanceOf extends BinaryExpr -// ino.end -// ino.class.InstanceOf.25352.body { - // ino.attribute.expr.25356.declaration public Expr expr; - // ino.end - // ino.attribute.reftype.25359.declaration private RefType reftype; - // ino.end - // ino.attribute.parserlog.25362.decldescription type=line // private boolean is_instance = false; - // ino.end - // ino.attribute.parserlog.25362.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.InstanceOf.25365.definition public InstanceOf(int offset,int variableLength) - // ino.end - // ino.method.InstanceOf.25365.body { super(offset,variableLength); // #JB# 20.04.2005 @@ -56,44 +39,27 @@ public class InstanceOf extends BinaryExpr //this.setType(new Type("boolean")); // ########################################################### } - // ino.end - // ino.method.set_Expr.25368.definition public void set_Expr(Expr exp) - // ino.end - // ino.method.set_Expr.25368.body { this.expr = exp; } - // ino.end - // ino.method.set_Type.25371.definition public void set_Type(RefType typ) - // ino.end - // ino.method.set_Type.25371.body { this.reftype = typ; } - // ino.end - // ino.method.get_Name.25377.definition public String get_Name() - // ino.end - // ino.method.get_Name.25377.body { return null; } - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25389.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25389.body { } - // ino.end @Override @@ -123,4 +89,3 @@ public JavaCodeResult printJavaCode(ResultSet resultSet) { } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.java index c9bf7db5..5f88a9aa 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.java @@ -1,7 +1,4 @@ -// ino.module.IntLiteral.8635.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.IntLiteral.8635.import import java.util.Hashtable; import org.apache.bcel.Constants; @@ -30,23 +27,13 @@ import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions; -// ino.class.IntLiteral.25447.declaration public class IntLiteral extends Literal -// ino.end -// ino.class.IntLiteral.25447.body { - // ino.attribute.Int.25451.declaration private int Int; - // ino.end - // ino.attribute.parserlog.25454.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.IntLiteral.25457.definition public IntLiteral() - // ino.end - // ino.method.IntLiteral.25457.body { super(-1,-1); // #JB# 20.04.2005 @@ -55,68 +42,41 @@ public class IntLiteral extends Literal //this.setType(new Type("int")); // ########################################################### } - // ino.end - // ino.method.set_Int.25460.definition public void set_Int(int i) - // ino.end - // ino.method.set_Int.25460.body { this.Int = i; } - // ino.end - // ino.method.get_Int.25463.definition public int get_Int() - // ino.end - // ino.method.get_Int.25463.body { return Int; } - // ino.end /* - // ino.method.sc_check.25466.definition public void sc_check(Menge classname, Hashtable ch, Hashtable bh, boolean ext, Hashtable parach, Hashtable parabh) - // ino.end - // ino.method.sc_check.25466.body { parserlog.debug("SC -> Semantik-Check f�r IntLiteral wurde aufgerufen --> nichts zu tun!"); } - // ino.end */ - // ino.method.get_Name.25469.definition public String get_Name() - // ino.end - // ino.method.get_Name.25469.body { return null; } - // ino.end - // ino.method.toString.25484.defdescription type=javadoc /** *
Author: Martin Pl�micke * @return */ - // ino.end - // ino.method.toString.25484.definition public String toString() - // ino.end - // ino.method.toString.25484.body { return getType().toString() + " " + Int; } - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25487.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25487.body { } - // ino.end @Override public ConstraintsSet TYPEExpr(TypeAssumptions assumptions) { @@ -150,4 +110,3 @@ public class IntLiteral extends Literal return il; } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Literal.java b/src/de/dhbwstuttgart/syntaxtree/statement/Literal.java index c2089e49..b1ba8f95 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/Literal.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/Literal.java @@ -1,49 +1,27 @@ -// ino.module.Literal.8636.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.class.Literal.25490.declaration public abstract class Literal extends Expr -// ino.end -// ino.class.Literal.25490.body { - // ino.attribute.primitiveFlag.29399.decldescription type=line // Gibt an, ob das Literal fuer einen Objekttyp oder // als primitive Konstante generiert werden soll. // Default: Konstanten werden als primitiver Typ generiert. - // ino.end - // ino.attribute.primitiveFlag.29399.declaration private boolean primitiveFlag=true; - // ino.end - // ino.method.setPrimitiveFlag.29402.definition public void setPrimitiveFlag(boolean b) - // ino.end - // ino.method.setPrimitiveFlag.29402.body { this.primitiveFlag=b; } - // ino.end - // ino.method.getPrimitiveFlag.29405.definition public boolean getPrimitiveFlag() - // ino.end - // ino.method.getPrimitiveFlag.29405.body { return(this.primitiveFlag); } - // ino.end - // ino.method.Literal.25494.definition public Literal(int offset,int variableLength) - // ino.end - // ino.method.Literal.25494.body { super(offset,variableLength); } - // ino.end } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/LocalOrFieldVarOrClassname.java b/src/de/dhbwstuttgart/syntaxtree/statement/LocalOrFieldVarOrClassname.java index c4f75ad4..b8494a9c 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/LocalOrFieldVarOrClassname.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/LocalOrFieldVarOrClassname.java @@ -1,7 +1,4 @@ -// ino.module.LocalOrFieldVar.8637.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.LocalOrFieldVar.8637.import import java.util.Enumeration; import java.util.Hashtable; @@ -36,83 +33,52 @@ import de.dhbwstuttgart.typeinference.exceptions.TypeinferenceException; -// ino.class.LocalOrFieldVar.25503.declaration public class LocalOrFieldVarOrClassname extends Expr -// ino.end -// ino.class.LocalOrFieldVar.25503.body { - // ino.attribute.parserlog.25507.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end private boolean isFieldAccess = false; private boolean isClassAccess = false; - // ino.method.LocalOrFieldVar.25510.definition public LocalOrFieldVarOrClassname(int offset, int variableLength) - // ino.end - // ino.method.LocalOrFieldVar.25510.body { super(offset,variableLength); } - // ino.end - // ino.method.LocalOrFieldVar.25513.definition public LocalOrFieldVarOrClassname(String n, int offset) - // ino.end - // ino.method.LocalOrFieldVar.25513.body { super(offset,n.length()); usedid = new UsedId(offset); usedid.set_Name(n); } - // ino.end - // ino.method.set_UsedId.25519.definition public void set_UsedId(UsedId u) - // ino.end - // ino.method.set_UsedId.25519.body { this.usedid=u; } - // ino.end - // ino.method.get_Name.25522.definition public String get_Name() - // ino.end - // ino.method.get_Name.25522.body { return usedid.get_Name_1Element(); } - // ino.end - // ino.method.toString.25534.defdescription type=javadoc /** *
Author: Martin Pl�micke * @return */ - // ino.end - // ino.method.toString.25534.definition public String toString() - // ino.end - // ino.method.toString.25534.body { if(getType()==null)return usedid.toString(); return usedid.toString() + ": " + getType().toString(); } - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25537.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25537.body { } - // ino.end @Override @@ -178,4 +144,3 @@ public class LocalOrFieldVarOrClassname extends Expr } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.java b/src/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.java index 603112b6..7fc200ce 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.java @@ -28,8 +28,6 @@ public class LocalVarDecl extends Statement implements TypeInsertable private String name; private RefType type; protected static Logger inferencelog = Logger.getLogger("inference"); - // ino.end - // ino.attribute.parserlog.25563.declaration protected static Logger parserlog = Logger.getLogger("parser"); public String get_Name() diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.java index 8da5f167..fce12316 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.java @@ -1,7 +1,4 @@ -// ino.module.IntLiteral.8635.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.IntLiteral.8635.import import java.util.Hashtable; import org.apache.bcel.generic.ClassGen; @@ -26,64 +23,38 @@ import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions; -// ino.class.IntLiteral.25447.declaration public class LongLiteral extends Literal -// ino.end -// ino.class.IntLiteral.25447.body { - // ino.attribute.Int.25451.declaration private long Long; - // ino.end - // ino.attribute.parserlog.25454.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.IntLiteral.25457.definition public LongLiteral() - // ino.end - // ino.method.IntLiteral.25457.body { super(-1,-1); this.setType(new RefType("Long",this,this.getOffset())); } - // ino.end - // ino.method.set_Int.25460.definition public void set_Long(long i) - // ino.end - // ino.method.set_Int.25460.body { this.Long = i; } - // ino.end - // ino.method.get_Int.25463.definition public long get_Long() - // ino.end - // ino.method.get_Int.25463.body { return Long; } - // ino.end /* - // ino.method.sc_check.25466.definition public void sc_check(Menge classname, Hashtable ch, Hashtable bh, boolean ext, Hashtable parach, Hashtable parabh) - // ino.end - // ino.method.sc_check.25466.body { parserlog.debug("SC -> Semantik-Check f�r LongLiteral wurde aufgerufen --> nichts zu tun!"); } - // ino.end */ - // ino.method.get_Name.25469.definition public String get_Name() - // ino.end - // ino.method.get_Name.25469.body { return null; } @@ -92,22 +63,13 @@ public class LongLiteral extends Literal *
Author: Martin Pl�micke * @return */ - // ino.end - // ino.method.toString.25484.definition public String toString() - // ino.end - // ino.method.toString.25484.body { return getType().toString() + " " + Long; } - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25487.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25487.body { } - // ino.end @Override public ConstraintsSet TYPEExpr(TypeAssumptions assumptions) { @@ -137,4 +99,3 @@ public JavaCodeResult printJavaCode(ResultSet resultSet) { return il; } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java b/src/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java index 9484cf03..cf77d708 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java @@ -1,7 +1,4 @@ -// ino.module.MethodCall.8639.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.MethodCall.8639.import import java.util.Hashtable; import org.apache.bcel.Const; @@ -36,10 +33,7 @@ import de.dhbwstuttgart.typeinference.exceptions.TypeinferenceException; -// ino.class.MethodCall.25623.declaration public class MethodCall extends Expr -// ino.end -// ino.class.MethodCall.25623.body { public MethodCall(Receiver receiver, String methodName, ArgumentList argumentList, int offset){ this(offset, 0); @@ -48,64 +42,39 @@ public class MethodCall extends Expr this.set_ArgumentList(argumentList); } - // ino.method.MethodCall.25627.definition public MethodCall(int offset) - // ino.end - // ino.method.MethodCall.25627.body { super(offset); } - // ino.end - // ino.attribute.receiver.25639.declaration /** * Diese Variable speichert die Expression, welche die Klasse von welcher die Methode aufgerufen wird darstellt. */ private Receiver receiver; - // ino.end - // ino.attribute.arglist.25642.declaration private ArgumentList arglist=new ArgumentList(); - // ino.attribute.parserlog.25663.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.set_ArgumentList.25666.definition public void set_ArgumentList(ArgumentList al) - // ino.end - // ino.method.set_ArgumentList.25666.body { this.arglist = al; } - // ino.end - // ino.method.getArgumentList.25669.definition public ArgumentList getArgumentList() - // ino.end - // ino.method.getArgumentList.25669.body { if(this.arglist==null)return this.arglist = new ArgumentList(); return this.arglist; } - // ino.end - // ino.method.get_Receiver.25672.definition public Receiver get_Receiver() - // ino.end - // ino.method.get_Receiver.25672.body { return receiver; } - // ino.end - // ino.method.get_Name.25675.definition public String get_Name() - // ino.end - // ino.method.get_Name.25675.body { return this.usedid.name.firstElement(); } - // ino.end public void set_Name(String name){ @@ -113,69 +82,43 @@ public class MethodCall extends Expr } - // ino.method.set_Receiver.25693.definition public void set_Receiver(Receiver rec) - // ino.end - // ino.method.set_Receiver.25693.body { receiver=rec; } - // ino.end - // ino.method.set_UsedId.25696.definition public void set_UsedId(UsedId u) - // ino.end - // ino.method.set_UsedId.25696.body { usedid=u; } - // ino.end - // ino.method.set_Expr_Menge.25699.definition public void set_Expr_Menge(Menge v) - // ino.end - // ino.method.set_Expr_Menge.25699.body { arglist.expr=v; } - // ino.end - // ino.method.add_Expr.25702.definition public void add_Expr(Expr e) - // ino.end - // ino.method.add_Expr.25702.body { arglist.expr.addElement(e); } - // ino.end - // ino.method.toString.25738.defdescription type=javadoc /** *
Author: Martin Pl�micke * @return */ - // ino.end - // ino.method.toString.25738.definition public String toString() - // ino.end - // ino.method.toString.25738.body { //return receiver/*.toString()*/ + " " + usedid.toString(); return type + " (" + this.get_Receiver() + "." + this.get_Name() +"(" + this.getArgumentList() + "))"; } - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25741.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25741.body { } - // ino.end /** * @author Andreas Stadelmeier, a10023 @@ -362,4 +305,3 @@ public class MethodCall extends Expr } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/NegativeExpr.java b/src/de/dhbwstuttgart/syntaxtree/statement/NegativeExpr.java index 62eab993..0e8e9d98 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/NegativeExpr.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/NegativeExpr.java @@ -1,7 +1,4 @@ -// ino.module.NegativeExpr.8640.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.NegativeExpr.8640.import import java.util.Hashtable; import java.util.Iterator; @@ -29,64 +26,34 @@ import de.dhbwstuttgart.typeinference.exceptions.NotImplementedException; -// ino.class.NegativeExpr.25744.declaration public class NegativeExpr extends UnaryExpr -// ino.end -// ino.class.NegativeExpr.25744.body { - // ino.method.NegativeExpr.25748.definition public NegativeExpr(int offset,int variableLength) - // ino.end - // ino.method.NegativeExpr.25748.body { super(offset,variableLength); } - // ino.end - // ino.attribute.neg.25751.declaration private UnaryMinus neg; - // ino.end - // ino.attribute.expr.25754.declaration public Expr expr; - // ino.end - // ino.attribute.parserlog.25757.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.get_Name.25760.definition public String get_Name() - // ino.end - // ino.method.get_Name.25760.body { return null; } - // ino.end - // ino.method.set_UnaryMinus.25766.definition public void set_UnaryMinus(UnaryMinus umin) - // ino.end - // ino.method.set_UnaryMinus.25766.body { this.neg = umin; } - // ino.end - // ino.method.set_Expr.25769.definition public void set_Expr(Expr ex) - // ino.end - // ino.method.set_Expr.25769.body { this.expr = ex; } - // ino.end - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25784.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25784.body { } - // ino.end @Override public ConstraintsSet TYPEExpr(TypeAssumptions assumptions) { @@ -114,4 +81,3 @@ public class NegativeExpr extends UnaryExpr } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/NewArray.java b/src/de/dhbwstuttgart/syntaxtree/statement/NewArray.java index a42570de..0958f013 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/NewArray.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/NewArray.java @@ -1,7 +1,4 @@ -// ino.module.NewArray.8641.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.NewArray.8641.import import java.util.Hashtable; import org.apache.bcel.generic.ClassGen; @@ -25,89 +22,52 @@ import de.dhbwstuttgart.typeinference.exceptions.NotImplementedException; -// ino.class.NewArray.25787.declaration public class NewArray extends Expr -// ino.end -// ino.class.NewArray.25787.body { - // ino.method.NewArray.25791.definition public NewArray(int offset,int variableLength) - // ino.end - // ino.method.NewArray.25791.body { super(offset,variableLength); } - // ino.end - // ino.attribute.type.25794.declaration private Type type; - // ino.end - // ino.attribute.expr.25797.declaration public Menge expr = new Menge(); - // ino.end - // ino.attribute.parserlog.25800.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.getType.25803.defdescription type=javadoc /** * Author: J�rg B�uerle
* @return Returns the type. */ - // ino.end - // ino.method.getType.25803.definition public Type getType() - // ino.end - // ino.method.getType.25803.body { return type; } - // ino.end - // ino.method.setType.25806.defdescription type=javadoc /** * Author: J�rg B�uerle
* @param type The type to set. */ - // ino.end - // ino.method.setType.25806.definition public void setType(Type type) - // ino.end - // ino.method.setType.25806.body { this.type = type; } - // ino.end - // ino.method.get_Name.25809.definition public String get_Name() - // ino.end - // ino.method.get_Name.25809.body { return null; } - // ino.end /* - // ino.method.sc_check.25812.definition public void sc_check(Menge classname, Hashtable bh, Hashtable ch,boolean ext, Hashtable parach, Hashtable parabh) - // ino.end - // ino.method.sc_check.25812.body { if(ext) parserlog.debug(" ---NewArray---"); } - // ino.end */ - // ino.method.wandleRefTypeAttributes2GenericAttributes.25827.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25827.body { } - // ino.end @Override public ConstraintsSet TYPEExpr(TypeAssumptions assumptions) { @@ -141,4 +101,3 @@ public JavaCodeResult printJavaCode(ResultSet resultSet) { } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/NewClass.java b/src/de/dhbwstuttgart/syntaxtree/statement/NewClass.java index 0f23a46a..57de5ad2 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/NewClass.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/NewClass.java @@ -1,8 +1,5 @@ -// ino.module.NewClass.8642.package package de.dhbwstuttgart.syntaxtree.statement; import java.util.ArrayList; -// ino.end -// ino.module.NewClass.8642.import import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; @@ -41,76 +38,44 @@ import de.dhbwstuttgart.typeinference.exceptions.TypeinferenceException; -// ino.class.NewClass.25830.declaration public class NewClass extends Expr -// ino.end -// ino.class.NewClass.25830.body { - // ino.method.NewClass.25834.definition public NewClass(int offset,int variableLength) - // ino.end - // ino.method.NewClass.25834.body { super(offset,variableLength); } - // ino.end - // ino.attribute.arglist.25837.declaration private ArgumentList arglist; private boolean isStatement = false; private List parameterList = new ArrayList<>(); - // ino.end - // ino.attribute.parserlog.25840.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.getArgumentList.25843.definition public ArgumentList getArgumentList() - // ino.end - // ino.method.getArgumentList.25843.body { return this.arglist; } - // ino.end - // ino.method.get_Name.25846.definition public String get_Name() - // ino.end - // ino.method.get_Name.25846.body { return this.usedid.get_Name_1Element(); } - // ino.end - // ino.method.set_UsedId.25849.definition public void set_UsedId( UsedId t) - // ino.end - // ino.method.set_UsedId.25849.body { this.usedid = t; } - // ino.end - // ino.method.set_ArgumentList.25855.definition public void set_ArgumentList(ArgumentList al) - // ino.end - // ino.method.set_ArgumentList.25855.body { this.arglist = al; } - // ino.end - // ino.method.toString.25867.defdescription type=javadoc /** *
Author: Martin Pl�micke * @return */ - // ino.end - // ino.method.toString.25867.definition public String toString() - // ino.end - // ino.method.toString.25867.body { String ret = "NEW "; Type thisType = getType(); @@ -118,15 +83,10 @@ public class NewClass extends Expr else ret += this.get_Name(); return ret; } - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25870.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25870.body { } - // ino.end @Override public ConstraintsSet TYPEExpr(TypeAssumptions assumptions) { @@ -229,4 +189,3 @@ public class NewClass extends Expr } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Null.java b/src/de/dhbwstuttgart/syntaxtree/statement/Null.java index cf3c6b12..12eb47aa 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/Null.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/Null.java @@ -1,7 +1,4 @@ -// ino.module.Null.8644.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.Null.8644.import import java.util.Hashtable; import org.apache.bcel.generic.ClassGen; @@ -26,55 +23,33 @@ import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions; -// ino.class.Null.25919.declaration public class Null extends Literal -// ino.end -// ino.class.Null.25919.body { - // ino.attribute.parserlog.25923.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.Null.25926.definition public Null() - // ino.end - // ino.method.Null.25926.body { super(-1,-1); //this.setType(new Type("__NULL__",this,getOffset())); } - // ino.end - // ino.method.get_Name.25929.definition public String get_Name() - // ino.end - // ino.method.get_Name.25929.body { return null; } - // ino.end /* - // ino.method.sc_check.25932.definition public void sc_check(Menge classname, Hashtable ch, Hashtable bh, boolean ext, Hashtable parach, Hashtable parabh) - // ino.end - // ino.method.sc_check.25932.body { if(ext) parserlog.debug(" ---Null---"); } - // ino.end */ - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25944.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.25944.body { } - // ino.end @Override public ConstraintsSet TYPEExpr(TypeAssumptions assumptions) { @@ -104,4 +79,3 @@ public class Null extends Literal } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/PostDecExpr.java b/src/de/dhbwstuttgart/syntaxtree/statement/PostDecExpr.java index 94dfa98e..53daae05 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/PostDecExpr.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/PostDecExpr.java @@ -1,7 +1,4 @@ -// ino.module.PostDecExpr.8646.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.PostDecExpr.8646.import import java.util.Hashtable; import java.util.Iterator; @@ -23,51 +20,29 @@ import de.dhbwstuttgart.typeinference.exceptions.NotImplementedException; -// ino.class.PostDecExpr.25987.declaration public class PostDecExpr extends UnaryExpr -// ino.end -// ino.class.PostDecExpr.25987.body { - // ino.method.PostDecExpr.25991.definition public PostDecExpr(int offset,int variableLength) - // ino.end - // ino.method.PostDecExpr.25991.body { super(offset,variableLength); } - // ino.end - // ino.attribute.parserlog.25997.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.set_Expr.26000.definition public void set_Expr(Expr ex) - // ino.end - // ino.method.set_Expr.26000.body { this.expr = ex; } - // ino.end - // ino.method.get_Name.26003.definition public String get_Name() - // ino.end - // ino.method.get_Name.26003.body { return null; } - // ino.end - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.26018.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.26018.body { } - // ino.end @Override public JavaCodeResult printJavaCode(ResultSet resultSet) { @@ -89,4 +64,3 @@ public JavaCodeResult printJavaCode(ResultSet resultSet) { } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/PostIncExpr.java b/src/de/dhbwstuttgart/syntaxtree/statement/PostIncExpr.java index 891198de..2fbb058f 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/PostIncExpr.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/PostIncExpr.java @@ -1,7 +1,4 @@ -// ino.module.PostIncExpr.8647.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.PostIncExpr.8647.import import java.util.Hashtable; import java.util.Iterator; @@ -34,52 +31,30 @@ import de.dhbwstuttgart.typeinference.unify.TypeUnify; -// ino.class.PostIncExpr.26021.declaration public class PostIncExpr extends UnaryExpr -// ino.end -// ino.class.PostIncExpr.26021.body { - // ino.method.PostIncExpr.26025.definition public PostIncExpr(int offset,int variableLength) - // ino.end - // ino.method.PostIncExpr.26025.body { super(offset,variableLength); } - // ino.end - // ino.attribute.parserlog.26031.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.set_Expr.26034.definition public void set_Expr(Expr ex) - // ino.end - // ino.method.set_Expr.26034.body { this.expr = ex; } - // ino.end - // ino.method.get_Name.26037.definition public String get_Name() - // ino.end - // ino.method.get_Name.26037.body { return null; } - // ino.end - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.26052.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.26052.body { } - // ino.end @Override public JavaCodeResult printJavaCode(ResultSet resultSet) { @@ -111,4 +86,3 @@ public JavaCodeResult printJavaCode(ResultSet resultSet) { } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/PreDecExpr.java b/src/de/dhbwstuttgart/syntaxtree/statement/PreDecExpr.java index 1d4a00d5..cf00a61d 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/PreDecExpr.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/PreDecExpr.java @@ -1,4 +1,3 @@ -// ino.module.PreDecExpr.8648.package package de.dhbwstuttgart.syntaxtree.statement; import org.apache.bcel.generic.ClassGen; @@ -22,23 +21,14 @@ import de.dhbwstuttgart.typeinference.exceptions.NotImplementedException; -// ino.class.PreDecExpr.26055.declaration public class PreDecExpr extends UnaryExpr -// ino.end -// ino.class.PreDecExpr.26055.body { - // ino.method.PreDecExpr.26059.definition public PreDecExpr(int offset,int variableLength) - // ino.end - // ino.method.PreDecExpr.26059.body { super(offset,variableLength); } - // ino.end - // ino.attribute.parserlog.26065.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end public String get_Name() @@ -65,4 +55,3 @@ public class PreDecExpr extends UnaryExpr } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/PreIncExpr.java b/src/de/dhbwstuttgart/syntaxtree/statement/PreIncExpr.java index 307082d6..46b10155 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/PreIncExpr.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/PreIncExpr.java @@ -29,23 +29,14 @@ public class PreIncExpr extends UnaryExpr - // ino.method.get_Name.26105.definition public String get_Name() - // ino.end - // ino.method.get_Name.26105.body { return null; } - // ino.end - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.26120.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.26120.body { } - // ino.end @Override public JavaCodeResult printJavaCode(ResultSet resultSet) { @@ -67,4 +58,3 @@ public JavaCodeResult printJavaCode(ResultSet resultSet) { } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Return.java b/src/de/dhbwstuttgart/syntaxtree/statement/Return.java index a17a6714..b88c914c 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/Return.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/Return.java @@ -1,7 +1,4 @@ -// ino.module.Return.8651.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.Return.8651.import import java.util.Hashtable; import org.apache.bcel.generic.ConstantPoolGen; @@ -26,63 +23,36 @@ import de.dhbwstuttgart.typeinference.assumptions.TypeAssumptions; -// ino.class.Return.26150.declaration public class Return extends Statement -// ino.end -// ino.class.Return.26150.body { - // ino.method.Return.26154.definition public Return(int offset,int variableLength) - // ino.end - // ino.method.Return.26154.body { super(offset,variableLength); } - // ino.end - // ino.attribute.retexpr.26157.declaration public Expr retexpr; - // ino.end - // ino.attribute.parserlog.26160.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.set_ReturnExpr.26166.definition public Return set_ReturnExpr(Expr ret) - // ino.end - // ino.method.set_ReturnExpr.26166.body { this.retexpr=ret; return this; } - // ino.end - // ino.method.get_Type.26169.definition public String get_Type() - // ino.end - // ino.method.get_Type.26169.body { return retexpr.getTypeName(); } - // ino.end - // ino.method.toString.26178.definition public String toString() - // ino.end - // ino.method.toString.26178.body { return type + " Return " + retexpr.toString(); } - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.26181.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.26181.body { } - // ino.end @Override public ConstraintsSet TYPEStmt(TypeAssumptions assumptions) { @@ -140,4 +110,3 @@ public class Return extends Statement return il; } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/StringLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/StringLiteral.java index 1c043363..3bee12e5 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/StringLiteral.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/StringLiteral.java @@ -7,8 +7,6 @@ import de.dhbwstuttgart.typeinference.Menge; -// ino.end -// ino.module.StringLiteral.8653.import import java.util.Hashtable; import org.apache.bcel.classfile.ConstantPool; @@ -36,14 +34,9 @@ public class StringLiteral extends Literal { private String string; - // ino.attribute.parserlog.26234.declaration protected static Logger parserlog = Logger.getLogger("parser"); - // ino.end - // ino.method.StringLiteral.26237.definition public StringLiteral() - // ino.end - // ino.method.StringLiteral.26237.body { super(-1,-1); // #JB# 20.04.2005 @@ -52,46 +45,29 @@ public class StringLiteral extends Literal //this.setType(new Type("String")); // ########################################################### } - // ino.end /* - // ino.method.sc_check.26240.definition public void sc_check(Menge classname, Hashtable ch, Hashtable bh, boolean ext, Hashtable parach, Hashtable parabh) - // ino.end - // ino.method.sc_check.26240.body { if(ext) parserlog.debug(" ---StringLiteral---"); } - // ino.end */ - // ino.method.set_String.26243.definition public void set_String( String s) - // ino.end - // ino.method.set_String.26243.body { this.string = s; } - // ino.end - // ino.method.get_Name.26246.definition public String get_Name() - // ino.end - // ino.method.get_Name.26246.body { return null; } - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.26258.definition public void wandleRefTypeAttributes2GenericAttributes(Menge paralist, Menge genericMethodParameters) - // ino.end - // ino.method.wandleRefTypeAttributes2GenericAttributes.26258.body { } - // ino.end @Override public ConstraintsSet TYPEExpr(TypeAssumptions assumptions) { @@ -117,8 +93,6 @@ public class StringLiteral extends Literal public String get_String() - // ino.end - // ino.method.get_Name.26246.body { return string; } @@ -140,4 +114,3 @@ public class StringLiteral extends Literal } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/SuperCall.java b/src/de/dhbwstuttgart/syntaxtree/statement/SuperCall.java index 28cb0bb2..cff8fcec 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/SuperCall.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/SuperCall.java @@ -1,7 +1,4 @@ -// ino.module.This.8654.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.This.8654.import import org.apache.bcel.Constants; import org.apache.bcel.generic.InstructionFactory; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/This.java b/src/de/dhbwstuttgart/syntaxtree/statement/This.java index 88c907f8..c7a0c57c 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/This.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/This.java @@ -1,7 +1,4 @@ -// ino.module.This.8654.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.This.8654.import import de.dhbwstuttgart.logger.Logger; @@ -29,7 +26,6 @@ import de.dhbwstuttgart.typeinference.exceptions.TypeinferenceException; -// ino.class.This.26261.declaration public class This extends Expr { public This(RefType type, int offset) diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/ThisCall.java b/src/de/dhbwstuttgart/syntaxtree/statement/ThisCall.java index c506386e..01a10add 100644 --- a/src/de/dhbwstuttgart/syntaxtree/statement/ThisCall.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/ThisCall.java @@ -1,7 +1,4 @@ -// ino.module.This.8654.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.This.8654.import import de.dhbwstuttgart.syntaxtree.Constructor; import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.java b/src/de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.java index e7f1deb3..07204bda 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.java @@ -1,7 +1,4 @@ -// ino.module.UnaryExpr.8655.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.module.UnaryExpr.8655.import import de.dhbwstuttgart.typeinference.Menge; import org.apache.bcel.generic.InstructionList; diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/UnaryMinus.java b/src/de/dhbwstuttgart/syntaxtree/statement/UnaryMinus.java index 20a6f8ce..7247a988 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/UnaryMinus.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/UnaryMinus.java @@ -1,15 +1,9 @@ -// ino.module.UnaryMinus.8656.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.class.UnaryMinus.26308.declaration public class UnaryMinus -// ino.end -// ino.class.UnaryMinus.26308.body { } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/UnaryNot.java b/src/de/dhbwstuttgart/syntaxtree/statement/UnaryNot.java index 5d6190ae..2dce91bd 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/UnaryNot.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/UnaryNot.java @@ -1,13 +1,7 @@ -// ino.module.UnaryNot.8657.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.class.UnaryNot.26314.declaration public class UnaryNot -// ino.end -// ino.class.UnaryNot.26314.body { } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/UnaryPlus.java b/src/de/dhbwstuttgart/syntaxtree/statement/UnaryPlus.java index 32432ca1..bedd66bd 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/UnaryPlus.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/UnaryPlus.java @@ -1,11 +1,5 @@ -// ino.module.UnaryPlus.8658.package package de.dhbwstuttgart.syntaxtree.statement; -// ino.end -// ino.class.UnaryPlus.26323.declaration public class UnaryPlus -// ino.end -// ino.class.UnaryPlus.26323.body { } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java b/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java index 7412a90f..d3d59927 100755 --- a/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java +++ b/src/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java @@ -1,4 +1,3 @@ -// ino.module.WhileStmt.8659.package package de.dhbwstuttgart.syntaxtree.statement; import java.util.Enumeration; @@ -39,7 +38,6 @@ public class WhileStmt extends Statement public Expr expr; public Statement loop_block; - // ino.attribute.parserlog.26339.declaration protected static Logger parserlog = Logger.getLogger("parser"); /** @@ -96,4 +94,3 @@ public class WhileStmt extends Statement return il; } } -// ino.end diff --git a/src/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java b/src/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java index 0c9cfd89..031e86c7 100755 --- a/src/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java +++ b/src/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java @@ -142,7 +142,6 @@ public class TypePlaceholder extends RefType // Spezialfunktionen, f�r makeFC() und unify() // Sollten sonst nicht aufgerufen werden... /////////////////////////////////////////////////////////////////// - // ino.method.backdoorFresh.26848.defdescription type=javadoc /** * Backdoor-Hilfsfunktion, die f�r makeFC() und unify() * ben�tigt wird, um neue TypePlaceholders zu erzeugen. Die erzeugten Variablen @@ -150,11 +149,7 @@ public class TypePlaceholder extends RefType *
Author: J�rg B�uerle * @return Eine neue TypePlaceholder */ - // ino.end - // ino.method.backdoorFresh.26848.definition public static TypePlaceholder backdoorFresh() - // ino.end - // ino.method.backdoorFresh.26848.body { //PL 05-08-22 SEHR GEFAEHRLICH diff --git a/src/de/dhbwstuttgart/typeinference/Pair.java b/src/de/dhbwstuttgart/typeinference/Pair.java index 5d5641f8..ebeccfa9 100755 --- a/src/de/dhbwstuttgart/typeinference/Pair.java +++ b/src/de/dhbwstuttgart/typeinference/Pair.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import de.dhbwstuttgart.typeinference.unify.model.PairOperator; -// ino.end import de.dhbwstuttgart.syntaxtree.type.FreshWildcardType; import de.dhbwstuttgart.syntaxtree.type.GenericTypeVar; import de.dhbwstuttgart.syntaxtree.type.RefType; @@ -40,23 +39,15 @@ public class Pair implements Serializable, DeepCloneable this(TA1,TA2); this.eOperator = eOp; } - // ino.end - // ino.method.Pair.26561.definition public Pair( RefType TA1, RefType TA2, PairOperator eOp, boolean bSubst ) - // ino.end - // ino.method.Pair.26561.body { // Konstruktor this(TA1,TA2,eOp); this.bSubst = bSubst; } - // ino.end - // ino.method.toString.26564.definition public String toString() - // ino.end - // ino.method.toString.26564.body { // otth: Gibt ein Paar als String aus --> zum Debuggen und Vergleichen String strElement1 = "NULL"; diff --git a/src/de/dhbwstuttgart/typeinference/TypeinferenceResultSet.java b/src/de/dhbwstuttgart/typeinference/TypeinferenceResultSet.java index c332d10c..828c7412 100755 --- a/src/de/dhbwstuttgart/typeinference/TypeinferenceResultSet.java +++ b/src/de/dhbwstuttgart/typeinference/TypeinferenceResultSet.java @@ -7,7 +7,6 @@ import de.dhbwstuttgart.typeinference.exceptions.TypeinferenceException; import de.dhbwstuttgart.typeinference.typedeployment.TypeInsertPoint; import de.dhbwstuttgart.typeinference.typedeployment.TypeInsertSet; -// ino.class.CTypeReconstructionResult.27238.description type=javadoc /** * Diese Container-Klasse kapselt alle Ergebniswerte f�r eine m�gliche * Typkombination einer Klasse und deren Methoden sowie lokalen Variablen. Eine @@ -31,16 +30,12 @@ public class TypeinferenceResultSet private ResultSet unifiedConstraints; private de.dhbwstuttgart.syntaxtree.Class ownerOfResultSet;//Jedes Resultset gilt immer nur für eine Klasse. Diese wird in dieser Variable gespeichert. - // ino.method.CTypeReconstructionResult.27256.definition public TypeinferenceResultSet(de.dhbwstuttgart.syntaxtree.Class inferedClass, Menge constraints, ResultSet unifiedConstraints) - // ino.end - // ino.method.CTypeReconstructionResult.27256.body { this.ownerOfResultSet = inferedClass; this.constraints = constraints; this.unifiedConstraints = unifiedConstraints; } - // ino.end /** * @author Andreas Stadelmeier, a10023 @@ -102,4 +97,3 @@ public class TypeinferenceResultSet return ret; } } -// ino.end