Changeset 13258


Ignore:
Timestamp:
Jul 26, 2019 11:34:50 AM (5 months ago)
Author:
joqvist
Message:

#5811 Upgrade JastAdd to version 2.3.4

Location:
branches/dev-jo-jastadd
Files:
1 added
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-jo-jastadd/Compiler/build-base.xml

    r13245 r13258  
    5959    <property name="jar_output" value="${target}/bin" />
    6060
    61     <property name="jastadd_dir" value="${base.dir}/../ThirdParty/JastAdd" />
     61    <property name="jastadd_jar" value="${base.dir}/../ThirdParty/JastAdd/jastadd-2.3.4.jar" />
     62    <property name="jastaddparser_jar" value="${base.dir}/../ThirdParty/JastAdd/JastAddParser.jar" />
    6263    <property name="junit_dir" value="${base.dir}/../ThirdParty/Junit" />
    6364    <property name="junit_jar" value="${junit_dir}/junit-4.10.jar" />
     
    686687                <mkdir dir="${java_output_intermediate}" />
    687688                <!-- run jastadd to generate AST files -->
    688                 <java classname="org.jastadd.JastAdd" classpath="${jastadd_dir}/jastadd2.jar" failonerror="true">
     689                <java classname="org.jastadd.JastAdd" classpath="${jastadd_jar}" failonerror="true">
    689690                    <arg value="--package=${ast_package}" />
    690691                    <arg value="--o=${java_output_intermediate}" />
     
    697698                    <arg value="--indent=4space" />
    698699                    <arg value="--inhEqCheck=false" />
     700                    <arg value="--optimize-imports" />
    699701                    <arg line="${jastadd_files}" />
    700702                </java>
     
    929931                                        </replace>
    930932                                        <!-- translate to beaver syntax -->
    931                                         <java classpath="${jastadd_dir}/JastAddParser.jar:${beaver-rt_jar}" classname="Main">
     933                                        <java classpath="${jastaddparser_jar}:${beaver-rt_jar}" classname="Main">
    932934                                            <arg value="${parsers.builddir}/@{parser}.parser"/>
    933935                                            <arg value="${parsers.builddir}/@{parser}.raw.beaver"/>
Note: See TracChangeset for help on using the changeset viewer.