Changeset 9674


Ignore:
Timestamp:
Mar 5, 2017 4:38:15 PM (3 years ago)
Author:
Zimon Kuhs
Message:

#5284

Updated JastAdd2 to the latest version due to recent fixes in 2.2.2.

This improves build time greatly (roughly 30% faster, back to before the update to 2.2.*).

This also exposes a bug regarding the NTA FunctionType in InstClassDecl for InstPartialFunctionCall. Added a workaround for the moment.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Compiler/ModelicaFlatTree/src/jastadd/FlatUtil.jrag

    r9639 r9674  
    14661466        }
    14671467    }
    1468    
     1468
     1469    public <T extends CommonVariableDecl> ArrayList<T> InstPartialFunctionCall.filterPartialInputs(ArrayList<T> decls) {
     1470        myInstCallable().actualInstClassDecl().getFunctionType_computed = false;
     1471        return super.filterPartialInputs(decls);
     1472    }
     1473
    14691474    /**
    14701475     * \brief List of CommonVariableDecl used as outputs in this function call
  • trunk/Compiler/ModelicaFrontEnd/src/jastadd/util/Util.jrag

    r9628 r9674  
    394394    public class List {
    395395
    396         /**
    397          * Creates a new ArrayList containing all the elements in this list, in the same order.
    398          */
    399         public ArrayList<T> toArrayList() {
    400             ArrayList<T> l = new ArrayList<T>(getNumChild());
    401             for (T e : this)
    402                 l.add(e);
    403             return l;
    404         }
    405        
    406         /**
    407          * Adds all nodes in an iterable to the list.
    408          */
    409         public void addAll(Iterable<? extends T> list) {
    410             for (T e : list)
    411                 add(e);
    412         }
    413        
    414         /**
    415          * Adds all nodes in an array to the list.
    416          */
    417          public <S extends T> void addAll(S[] list) {
    418              for (S e : list)
    419                  add(e);
    420         }
    421        
    422     }
    423 
    424    
     396        /**
     397         * Creates a new ArrayList containing all the elements in this list, in the same order.
     398         */
     399        public ArrayList<T> toArrayList() {
     400            ArrayList<T> l = new ArrayList<T>(getNumChild());
     401            for (T e : this)
     402                l.add(e);
     403            return l;
     404        }
     405
     406        /**
     407         * Adds all nodes in an array to the list.
     408         */
     409         public <S extends T> void addAll(S[] list) {
     410             for (S e : list)
     411                 add(e);
     412        }
     413       
     414    }
     415
    425416    /**
    426417     * Replace <code>from</code> with <code>to</code>.
  • trunk/Compiler/build-base.xml

    r9612 r9674  
    531531                    <arg value="--lazyMaps" />
    532532                    <arg value="--indent=4space" />
    533                     <arg value="--inhEqCheck=false" />
    534533                    <arg line="${jastadd_files}" />
    535534                </java>
    536                 <!-- delete stale java files created in earlier runs -->
     535                <!-- delete stale java files created in earlier runs -->
    537536                <delete verbose="true">
    538537                    <fileset dir="${ast_output}">
Note: See TracChangeset for help on using the changeset viewer.