Quantifiers use relations!!!

[repair.git] / Repair / RepairCompiler / MCC / Makefile

diff --git a/Repair/RepairCompiler/MCC/Makefile b/Repair/RepairCompiler/MCC/Makefile
index b1d5648285f7d9c239557cd376f715d9ea043ff0..b8aef1f5781321bc46f6f324621732ae9dd60efc 100755 (executable)
--- a/Repair/RepairCompiler/MCC/Makefile
+++ b/Repair/RepairCompiler/MCC/Makefile
@@ -14,35 +14,51 @@ TDLParser.java TDLParser.class \
 CDLParser.java CDLParser.class \
 SDLParser.java SDLParser.class
 
+CLASSPATH = /usr/java/j2sdk1.4.2_03/jre/lib/charsets.jar:/usr/java/j2sdk1.4.2_03/jre/lib/jce.jar:/usr/java/j2sdk1.4.2_03/jre/lib/jsse.jar:/usr/java/j2sdk1.4.2_03/jre/lib/plugin.jar:/usr/java/j2sdk1.4.2_03/jre/lib/rt.jar:/usr/java/j2sdk1.4.2_03/jre/lib/sunrsasign.jar
+
 COMPILER_CLASS = Compiler.class
 CLI_CLASS = CLI.class
 OTHER_CLASS = State.class LineCount.class Symbol.class
 
-IR_CLASS = IR/ParseNode.class IR/ParseNodeVector.class IR/ParseNodeDOTVisitor.class \
-IR/SemanticChecker.class IR/Expr.class IR/VarExpr.class IR/OpExpr.class IR/DotExpr.class \
-IR/LiteralExpr.class IR/IntegerLiteralExpr.class IR/BooleanLiteralExpr.class \
-IR/TokenLiteralExpr.class IR/Descriptor.class IR/TypeDescriptor.class IR/StructureTypeDescriptor.class \
-IR/MissingTypeDescriptor.class IR/ReservedTypeDescriptor.class IR/ArrayDescriptor.class \
-IR/FieldDescriptor.class IR/LabelDescriptor.class IR/ReservedFieldDescriptor.class \
-IR/SymbolTable.class IR/IRException.class IR/Opcode.class IR/SimpleIRErrorReporter.class \
-IR/IRErrorReporter.class IR/SetDescriptor.class IR/MissingSetDescriptor.class \
-IR/RelationDescriptor.class IR/ReservedSetDescriptor.class IR/TokenSetDescriptor.class \
-IR/Quantifier.class IR/SetQuantifier.class IR/ImageSetExpr.class \
-IR/CastExpr.class IR/SizeofExpr.class IR/SetExpr.class IR/VarDescriptor.class \
-IR/LogicStatement.class IR/Predicate.class IR/InclusionPredicate.class \
-IR/ExprPredicate.class IR/Constraint.class IR/RelationExpr.class \
-IR/RelationQuantifier.class IR/ForQuantifier.class IR/GraphNode.class \
-IR/DependencyBuilder.class IR/RelationInclusion.class IR/SetInclusion.class \
-IR/TupleOfExpr.class IR/ElementOfExpr.class IR/Rule.class IR/Inclusion.class \
-IR/NaiveGenerator.class IR/CodeWriter.class IR/SymbolTableStack.class \
-IR/StandardCodeWriter.class IR/WorklistGenerator.class IR/WorkList.class \
-IR/Optimizer.class IR/MetaInclusion.class IR/SizeofFunction.class \
-IR/RelationFunctionExpr.class
-
-#MODEL_CLASS = Field.class Literal.class Quantifier.class              \
-#Set.class TypeElement.class                                           \
-#MDElementExpr.class Rule.class Guard.class Type.class                         \
-#ParseException.class ModelInclusionConstraint.class
+IR_CLASS = IR/ParseNode.class IR/ParseNodeVector.class                 \
+IR/ParseNodeDOTVisitor.class IR/SemanticChecker.class IR/Expr.class    \
+IR/VarExpr.class IR/OpExpr.class IR/DotExpr.class IR/LiteralExpr.class \
+IR/IntegerLiteralExpr.class IR/BooleanLiteralExpr.class                        \
+IR/TokenLiteralExpr.class IR/Descriptor.class IR/TypeDescriptor.class  \
+IR/StructureTypeDescriptor.class IR/MissingTypeDescriptor.class                \
+IR/ReservedTypeDescriptor.class IR/ArrayDescriptor.class               \
+IR/FieldDescriptor.class IR/LabelDescriptor.class                      \
+IR/ReservedFieldDescriptor.class IR/SymbolTable.class                  \
+IR/IRException.class IR/Opcode.class IR/SimpleIRErrorReporter.class    \
+IR/IRErrorReporter.class IR/SetDescriptor.class                                \
+IR/MissingSetDescriptor.class IR/RelationDescriptor.class              \
+IR/ReservedSetDescriptor.class IR/TokenSetDescriptor.class             \
+IR/Quantifier.class IR/SetQuantifier.class IR/ImageSetExpr.class       \
+IR/CastExpr.class IR/SizeofExpr.class IR/SetExpr.class                 \
+IR/VarDescriptor.class IR/LogicStatement.class IR/Predicate.class      \
+IR/InclusionPredicate.class IR/ExprPredicate.class IR/Constraint.class \
+IR/RelationExpr.class IR/RelationQuantifier.class                      \
+IR/ForQuantifier.class IR/GraphNode.class IR/DependencyBuilder.class   \
+IR/RelationInclusion.class IR/SetInclusion.class IR/TupleOfExpr.class  \
+IR/ElementOfExpr.class IR/Rule.class IR/Inclusion.class                        \
+IR/CodeWriter.class IR/SymbolTableStack.class  \
+IR/StandardCodeWriter.class IR/SumExpr.class           \
+IR/WorkList.class IR/PrintWrapper.class                \
+IR/RepairGenerator.class IR/AbstractInterferes.class                   \
+IR/PrettyPrinter.class IR/AbstractRepair.class IR/Quantifiers.class    \
+IR/Binding.class IR/ConcreteInterferes.class IR/Conjunction.class      \
+IR/Repair.class IR/ConsequenceNode.class IR/Cost.class                 \
+IR/DNFConstraint.class IR/DNFExpr.class IR/DNFPredicate.class          \
+IR/RuleConjunction.class IR/DNFRule.class IR/ScopeNode.class           \
+IR/SemanticAnalyzer.class IR/GraphAnalysis.class IR/SetAnalysis.class  \
+IR/Sources.class IR/StructureGenerator.class IR/ImplicitSchema.class   \
+IR/Termination.class IR/LinedMessage.class IR/TermNode.class           \
+IR/UpdateNode.class IR/MultUpdateNode.class IR/Updates.class           \
+IR/Walkable.class
+
+#MODEL_CLASS = Field.class Literal.class Quantifier.class Set.class    \
+#TypeElement.class MDElementExpr.class Rule.class Guard.class          \
+#Type.class ParseException.class ModelInclusionConstraint.class
 
 ALL_CLASS = $(COMPILER_CLASS) $(CLI_CLASS) $(OTHER_CLASS) $(IR_CLASS)
 
@@ -51,7 +67,7 @@ ALLJAVA = *.java IR/*.java
 
 .PHONY: java clean all tests javadoc
 
-all: $(TARGET).tar.gz $(TARGET).jar 
+all: $(TARGET).tar.gz $(TARGET).jar
 
 tests: $(TARGET).tar.gz $(TARGET).jar
 #      ./tests.pl scanner
@@ -59,7 +75,7 @@ tests: $(TARGET).tar.gz $(TARGET).jar
 $(TARGET).tar.gz: $(TARGET).tar
        gzip $(TARGET).tar -c > $(TARGET).tar.gz
 
-$(TARGET).tar: $(ALLJAVA) Makefile $(SCANNER).lex 
+$(TARGET).tar: $(ALLJAVA) Makefile $(SCANNER).lex
        tar cf $@ $(ALLJAVA) Makefile $(SCANNER).lex
 
 $(TARGET).jar: java
@@ -82,6 +98,7 @@ parser: $(PARSERS) $(SCANNER).java
 
 %.class: %.java
        javac -classpath ../ -source 1.4 $<
+#      jikes -classpath $(CLASSPATH):../ $<
 
 %.lex.java: %.lex
        java -classpath ../ JLex.Main $<
@@ -91,5 +108,4 @@ $(SCANNER).java: $(SCANNER).lex.java
        rm $(SCANNER).lex.java
 
 javadoc:
-       javadoc -package -d ../javadoc/ -windowtitle MCC $(ALLJAVA)
-
+       javadoc -source 1.4 -classpath ../ -package -d ../javadoc/ -windowtitle MCC $(ALLJAVA)