semantic error recovery [test]

Author: mdodovic

MJCompiler/src/rs/ac/bg/etf/pp1/SemanticAnalyzer.java

@@ -782,7 +782,7 @@ public void visit(InnerClassBodyDummyStart innerClassBodyDummyStart) {
  private boolean checkConstructorNameConstraint(String constructorName, SyntaxNode info) {
 
  if(!constructorName.equals(currentClassName)) {
- report_error(constructorName+ " nije istog imena kao klasa " + currentClassName + " u kojoj je definisan!", info); 
+ report_error("Konstruktor " + constructorName + " nije istog imena kao klasa " + currentClassName + " u kojoj je definisan!", info); 
  return false;
 	}
 
@@ -1398,50 +1398,7 @@ public void visit(MulOpFactorList mulOpFactorList) {
  public void visit(Term term) {
  // single factor should only pass its type
  term.struct = term.getFactorList().struct;
- }
-/* 
- @Override
- public void visit(SingleTerm singleTerm) {
-	// send type (TermType) to the Expr
-	singleTerm.struct = singleTerm.getTerm().struct;
- }
- 
- @Override
- public void visit(AddOpTermList addOpTermList) {
-	if(!addOpTermList.getTerm().struct.compatibleWith(addOpTermList.getTermList().struct)) {
- // ! Specification constraint: Expr and Term types have to be compatible
-	report_error("Tip svih sabiraka moraju biti kompatibilni (" + structDescription(addOpTermList.getTerm().struct) + "," + structDescription(addOpTermList.getTermList().struct) + ")", addOpTermList); 
-	addOpTermList.struct = Tab.noType;
-	return;
-	}
-	if(addOpTermList.getTerm().struct != Tab.intType || addOpTermList.getTermList().struct != Tab.intType) {
- // ! Specification constraint: Expr and Term have to be the int type
-	report_error("Tip svih sabiraka treba da bude int", addOpTermList); 
-	addOpTermList.struct = Tab.noType;
-	return;
-	}
-	// send cumulative type (intType) to the Expr
-	addOpTermList.struct = Tab.intType;
- }
- 
- @Override
- public void visit(PositiveExpr positiveExpr) {
- // expression without "-" should only pass its type
-	positiveExpr.struct = positiveExpr.getTermList().struct;
- }
- 
- @Override
- public void visit(NegativeExpr negativeExpr) {
-	if(negativeExpr.getTerm().struct != Tab.intType) {
- // ! Specification constraint: Expr has to be the int type
-	report_error("Tip negiranog izraza treba da bude int", negativeExpr); 
-	negativeExpr.struct = Tab.noType;
-	return;
-	}
-	// send cumulative type (intType) to the Expr
-	negativeExpr.struct = Tab.intType; 
- }
-*/ 
+ } 
 
  @Override
  public void visit(SinglePositiveTerm singlePositiveTerm) {

MJCompiler/test/semantic_errors_recovery.mj

@@ -0,0 +1,142 @@
+program SemanticErrorRecovery
+
+Integer x;
+
+const int cinilac1 = 4, cinilac1 = 3, cinilac2 = true;
+
+record T1 {
+int a;
+}
+
+record T1 {
+int b;
+}
+
+class A1 {
+int a;
+}
+
+class A1 {
+int b;
+}
+
+class A2 extends Integer {
+
+}
+
+class A3 extends T1 {
+
+}
+
+
+class B1 {
+
+{
+B2() {
+
+}
+
+}
+}
+
+class B2 {
+
+{
+B2() {
+return 4;
+}
+}
+
+}
+
+class C {
+{
+int foo(int z) int a; {
+return a;
+}
+
+void bar(int a, int b, int c) {
+
+}
+
+void super_f(int a) {
+
+}
+}
+}
+
+class C2 extends C{
+{
+int foo(int z1, int z2) int a; {
+return a;
+}
+void bar(int a, B2 b, int c) {
+
+}
+void super_f(int b) {
+
+}
+
+}
+}
+
+
+{
+int f(int x) {
+return -x;
+}
+
+int f() {
+
+}
+void g(char c1, char c1) {
+return c1;
+}
+
+void main() 
+f function_instance; int a[]; char c; C instC; C arrC[];
+{
+
+a = new int['c'];
+c = new int;
+c = new C2;
+
+a[0] = f(1,2,3);
+a[1] = C2(1,2,3);
+
+
+c.super_f(1, true);
+
+instC.super_f(1, true);
+
+read(instC);
+
+a[1] = 1 + true;
+a[1] = false + true;
+a[1] = -c;
+
+super();
+
+instC.z = 6;
+
+instC++;
+arrC++;
+f = f;
+
+break;
+continue;
+
+print(arrC);
+
+if(1) {
+}
+
+if(arrC <= inscC){
+}
+
+if(true > 1) {
+
+}
+}
+
+}