db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r399450 - in /db/derby/code/trunk: build.xml java/engine/org/apache/derby/impl/sql/build.xml java/tools/org/apache/derby/impl/tools/build.xml
Date Wed, 03 May 2006 21:53:02 GMT
Author: fuzzylogic
Date: Wed May  3 14:53:00 2006
New Revision: 399450

URL: http://svn.apache.org/viewcvs?rev=399450&view=rev
Log:
DERBY-1078: Fix problem with parsers on IBM JDK 1.3.1 by qualifying the
one reference to the interface field tokenImage in the generated parser source
with the interface class name.

Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/build.xml?rev=399450&r1=399449&r2=399450&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Wed May  3 14:53:00 2006
@@ -397,6 +397,10 @@
         failonerror="true">
       <arg value="${jjfile}"/>
     </java>
+    <!-- Qualify reference to tokenImage to fix issue with inheritence -->
+    <!-- IBM JDK 1.3.1. See DERBY-1078                                 -->
+    <replaceregexp file="${directory}/${chkfile}" match="tokenImage" 
+                   replace="${constantsfile}.tokenImage"/>
   </target>
 
   <target name="chkparser">

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml?rev=399450&r1=399449&r2=399450&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml Wed May  3 14:53:00
2006
@@ -26,6 +26,7 @@
       <property name="rmfiles" value="implparser_rm.files"/>
       <property name="jjfile" value="sqlgrammar.jj"/>
       <property name="chkfile" value="SQLParser.java"/>
+      <property name="chkfile" value="SQLParserConstants"/>
     </ant>
   </target>
 

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml?rev=399450&r1=399449&r2=399450&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml Wed May  3 14:53:00
2006
@@ -26,6 +26,7 @@
       <property name="rmfiles" value="ijimplparser_rm.files"/>
       <property name="jjfile" value="ij.jj"/>
       <property name="chkfile" value="ij.java"/>
+      <property name="constantsfile" value="ijConstants"/>
     </ant>
     <ant antfile="${src.dir}/build.xml" target="genParser">
       <property name="msg" value="Generating mtGrammar parser..."/>
@@ -33,6 +34,7 @@
       <property name="rmfiles" value="mtparser_rm.files"/>
       <property name="jjfile" value="mtGrammar.jj"/>
       <property name="chkfile" value="mtGrammar.java"/>
+      <property name="constantsfile" value="mtGrammarConstants"/>
     </ant>
   </target>
 



Mime
View raw message