[Scstudio-commits] SF.net SVN: scstudio:[1301] trunk

[<xr...@us...>]

Revision: 1301
          http://scstudio.svn.sourceforge.net/scstudio/?rev=1301&view=rev
Author:   xrehak
Date:     2012-01-23 09:35:01 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
Newer version of ANTLR is prefered.
Repaired compatibility to all antlr-3.1.* and antlr-3.4.

Modified Paths:
--------------
    trunk/FindANTLR.cmake
    trunk/src/data/Z120/z120_load.cpp

Modified: trunk/FindANTLR.cmake
===================================================================
--- trunk/FindANTLR.cmake	2012-01-23 08:11:28 UTC (rev 1300)
+++ trunk/FindANTLR.cmake	2012-01-23 09:35:01 UTC (rev 1301)
@@ -5,10 +5,10 @@
 
 FIND_FILE(ANTLR_CLASSPATH
   NAMES
+    antlr-3.4-complete.jar
+    antlr-3.1.3.jar
+    antlr-3.1.2.jar
     antlr-3.1.1.jar
-    antlr-3.1.2.jar
-    antlr-3.1.3.jar
-    antlr-3.4-complete.jar
   PATHS
     ${ANTLR_ROOT}/lib
   DOC "The ANTLR class file")

Modified: trunk/src/data/Z120/z120_load.cpp
===================================================================
--- trunk/src/data/Z120/z120_load.cpp	2012-01-23 08:11:28 UTC (rev 1300)
+++ trunk/src/data/Z120/z120_load.cpp	2012-01-23 09:35:01 UTC (rev 1301)
@@ -25,8 +25,15 @@
 {
   std::vector<MscPtr> result;
   
+#ifdef ANTLR3_ENC_8BIT
+  // ANTLR version >= 3.4
   pANTLR3_INPUT_STREAM input =
     antlr3FileStreamNew((pANTLR3_UINT8)filename.c_str(), ANTLR3_ENC_8BIT);
+#else
+ // ANTLR version 3.1.*
+  pANTLR3_INPUT_STREAM input =
+    antlr3AsciiFileStreamNew((pANTLR3_UINT8)filename.c_str());
+#endif
   if (input == NULL || input < 0)
   {
     print_report(RS_ERROR,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.