Changeset 13587


Ignore:
Timestamp:
Sep 24, 2019 10:24:57 AM (2 months ago)
Author:
molsson
Message:

AUTO catchup merge from trunk to branches/dev-mo-2401

Location:
branches/dev-mo-2401
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-mo-2401

  • branches/dev-mo-2401/Compiler/ModelicaFlatTree/src/jastadd/FlatAPI/FlatAPI.jrag

    r13456 r13587  
    23682368    inh FClass FFunctionDecl.myFClass();
    23692369    inh FClass FRecordDecl.myFClass();
     2370    inh FClass FDerivedType.myFClass();
    23702371    inh FClass FAlgorithm.myFClass();
    23712372    inh FClass FAbstractEquation.myFClass();
  • branches/dev-mo-2401/Compiler/ModelicaFlatTree/src/jastadd/FlatUtil.jrag

    r13456 r13587  
    16891689     
    16901690
    1691     public String FClass.nextTempFuncName() {
    1692         String name;
    1693         do {
    1694             name = "temp_" + nextTempFuncIndex++;
    1695         } while (lookupFunc(name) != null);
    1696         return name;
    1697     }
    1698     private int FClass.nextTempFuncIndex = 1;
    1699 
    1700 
    17011691    /**
    17021692     * Creates new temporary variables with the given name.
  • branches/dev-mo-2401/Compiler/ModelicaFlatTree/src/jastadd/PrettyPrint.jrag

    r13539 r13587  
    13271327
    13281328    public void FDerivedType.prettyPrint(Printer p, CodeStream str, String indent) {
     1329        prettyPrintWithName(p, str, indent, getName());
     1330    }
     1331   
     1332    private void FDerivedType.prettyPrintWithName(Printer p, CodeStream str, String indent, String name) {
    13291333        if (!getBaseType().isEnum()) {
    1330             str.print(indent, "type ", getName(), " = ", getBaseType());
     1334            str.print(indent, "type ", name, " = ", getBaseType());
    13311335            getFAttributeList().prettyPrintFAttributeList(str, p);
    13321336            str.println(";");
  • branches/dev-mo-2401/Compiler/TestFramework/src/jastadd/TestAnnotationizer.jrag

    r13294 r13587  
    11791179            checkData(data);
    11801180            methodName = data[0].toString();
    1181             arguments = (data.length == 1) ? new Object[0] : (Object[]) data[1];
     1181            arguments = arguments();
    11821182            Method method = o.getClass().getMethod(methodName, TestCase.unwrapClasses(arguments));
    11831183            methodResult = method.invoke(o, arguments).toString();
     1184        }
     1185       
     1186        private Object[] arguments() {
     1187            if (data.length > 1) {
     1188                if (data[1] != null) {
     1189                    return (Object[]) data[1];
     1190                }
     1191            }
     1192            return new Object[0];
    11841193        }
    11851194       
Note: See TracChangeset for help on using the changeset viewer.