FWD » Core Development » Base Language

Created task branch 10248a.

Committed revision 16026 on task branch 10248a:
- Fix for RETURN ERROR statement on non-void method.

I have noticed that when I put RETURN ERROR on a getter/setter, the test passes on OE, but on FWD it does not pass the conversion:

Caused by: java.lang.NullPointerException: Cannot invoke "antlr.collections.AST.getType()" because the return value of "com.goldencode.expr.CompiledExpression.getVar(int)" is null

I'm OK with the change.

After fixing the RETURN ERROR statement on non-void method, I have found in a customer application, a UNDO, RETURN ERROR statement which returns a OO object, which fails to compile.
Test case:

    METHOD PUBLIC INTEGER MethodCall3 ():
        DO TRANSACTION:
            RETURN ERROR NEW AppError("dummy").
        END.
        Assert:IsTrue(FALSE).
        CATCH aError AS Progress.Lang.Error :
            UNDO, RETURN ERROR NEW AppError("err3").
        END CATCH.
    END METHOD.

Converted code:

   @LegacySignature(type = Type.METHOD, name = "MethodCall3", returns = "INTEGER")
   public integer methodCall3()
   {
      object<? extends LegacyError> aError_top = TypeFactory.object(LegacyError.class);

      return function(TestCatchReturnCustomError.class, this, "MethodCall3", integer.class, new Block((Init) () -> 
      {
         catchError(LegacyError.class, 
         aError -> 
         {
            aError_top.assign(aError);
            undoReturnErrorTopLevel(ObjectOps.newInstance(AppError.class, "I", "err3"));
         });
      }, 
      (Body) () -> 
      {
         doBlock(TransactionType.FULL, "blockLabel0", new Block((Body) () -> 
         {
            {
               returnError(ObjectOps.newInstance(AppError.class, "I", "dummy"));
            }
         }));
      }));
   }

Compilation error:

compile:
    [javac] Compiling 51 source files to /home/tg/gcd/testcases2/testcases/build/classes
    [javac] Compiling 1 source file to /home/tg/gcd/testcases2/testcases/build/classes
    [javac] /home/tg/gcd/testcases2/testcases/src/com/goldencode/testcases/tests/error_handling/TestCatchReturnCustomError.java:119: error: no suitable method found for undoReturnErrorTopLevel(object<AppError>)
    [javac]             undoReturnErrorTopLevel(ObjectOps.newInstance(AppError.class, "I", "err3"));
    [javac]             ^
    [javac]     method BlockManager.undoReturnErrorTopLevel(String) is not applicable
    [javac]       (argument mismatch; no instance(s) of type variable(s) T exist so that object<T> conforms to String)
    [javac]     method BlockManager.undoReturnErrorTopLevel(character) is not applicable
    [javac]       (argument mismatch; no instance(s) of type variable(s) T exist so that object<T> conforms to character)
    [javac]   where T is a type-variable:
    [javac]     T extends _BaseObject_ declared in method <T>newInstance(Class<T>,String,Object...)
    [javac] Note: Some messages have been simplified; recompile with -Xdiags:verbose to get full output
    [javac] 1 error

Committed revision 16028 on task branch 10248a:
- Added undoReturnErrorTopLevel(BaseDataType) overload on UNDO, RETURN ERROR statement.

I have modified the test to check the execution after where the error is thrown and the test passes. Please let me know if there is something that I need to address. ABL codeABL code

    @Test(expected="Progress.Lang.AppError":U).
    METHOD PUBLIC VOID TestMethodTransactionCatchReturnCustomError ():
        MethodCall3 ().
        Assert:IsTrue(FALSE).
        CATCH aError AS Progress.Lang.Error :
            Assert:Equals(1, aError:NumMessages).
            Assert:Equals("err3", aError:GetMessage(1)).
        END CATCH.
    END METHOD.
    METHOD PUBLIC INTEGER MethodCall3 ():
        DO TRANSACTION:
            RETURN ERROR NEW AppError("dummy").
        END.
        Assert:IsTrue(FALSE).
        CATCH aError AS Progress.Lang.Error :
            UNDO, RETURN ERROR NEW AppError("err3", 1).
        END CATCH.
    END METHOD.

Please merge 10248a now.

Branch 10248a was merged to trunk revision 16050 and archived.