[Tora-cvs] SF.net SVN: tora:[4856] trunk/tora/extlibs

[<ibr...@us...>]

Revision: 4856
          http://sourceforge.net/p/tora/code/4856
Author:   ibre5041
Date:     2013-10-02 19:26:12 +0000 (Wed, 02 Oct 2013)
Log Message:
-----------
sync with ANTLR trunk

Modified Paths:
--------------
    trunk/tora/extlibs/libantlr3cpp-3.5.1/include/antlr3.hpp
    trunk/tora/extlibs/libantlr3cpp-3.5.1/include/antlr3defs.hpp
    trunk/tora/extlibs/libantlr3cpp-3.5.1/include/antlr3exception.inl
    trunk/tora/extlibs/libantlr3cpp-3.5.1/include/antlr3lexer.inl
    trunk/tora/extlibs/parsing.cpp/org/antlr/codegen/templates/Cpp/Cpp.stg

Modified: trunk/tora/extlibs/libantlr3cpp-3.5.1/include/antlr3.hpp
===================================================================
--- trunk/tora/extlibs/libantlr3cpp-3.5.1/include/antlr3.hpp	2013-09-27 13:31:16 UTC (rev 4855)
+++ trunk/tora/extlibs/libantlr3cpp-3.5.1/include/antlr3.hpp	2013-10-02 19:26:12 UTC (rev 4856)
@@ -30,7 +30,6 @@
 
 #include <string>
 #include <sstream>
-#include <memory>
 
 #include    "antlr3defs.hpp"
 

Modified: trunk/tora/extlibs/libantlr3cpp-3.5.1/include/antlr3defs.hpp
===================================================================
--- trunk/tora/extlibs/libantlr3cpp-3.5.1/include/antlr3defs.hpp	2013-09-27 13:31:16 UTC (rev 4855)
+++ trunk/tora/extlibs/libantlr3cpp-3.5.1/include/antlr3defs.hpp	2013-10-02 19:26:12 UTC (rev 4856)
@@ -98,6 +98,8 @@
 #define ANTLR_BEGIN_NAMESPACE() namespace antlr3 {
 #define ANTLR_END_NAMESPACE() }
 
+#define ANTLR_USE_64BIT
+
 /* Common definitions come first
  */
 #include    <antlr3errors.hpp>

Modified: trunk/tora/extlibs/libantlr3cpp-3.5.1/include/antlr3exception.inl
===================================================================
--- trunk/tora/extlibs/libantlr3cpp-3.5.1/include/antlr3exception.inl	2013-09-27 13:31:16 UTC (rev 4855)
+++ trunk/tora/extlibs/libantlr3cpp-3.5.1/include/antlr3exception.inl	2013-10-02 19:26:12 UTC (rev 4856)
@@ -3,6 +3,7 @@
 template<class ImplTraits, class StreamType>
 ANTLR_ExceptionBase<ImplTraits, StreamType>::ANTLR_ExceptionBase(const StringType& message)
 	:m_message(message)
+	,m_input(NULL)
 {
 	m_index = 0;
 	m_token	= NULL;

Modified: trunk/tora/extlibs/libantlr3cpp-3.5.1/include/antlr3lexer.inl
===================================================================
--- trunk/tora/extlibs/libantlr3cpp-3.5.1/include/antlr3lexer.inl	2013-09-27 13:31:16 UTC (rev 4855)
+++ trunk/tora/extlibs/libantlr3cpp-3.5.1/include/antlr3lexer.inl	2013-10-02 19:26:12 UTC (rev 4856)
@@ -3,6 +3,7 @@
 template<class ImplTraits>
 Lexer<ImplTraits>::Lexer(ANTLR_UINT32 sizeHint, RecognizerSharedStateType* state)
 	:Lexer<ImplTraits>::RecognizerType(sizeHint, state)
+	,m_input(NULL)
 {
 }
 

Modified: trunk/tora/extlibs/parsing.cpp/org/antlr/codegen/templates/Cpp/Cpp.stg
===================================================================
--- trunk/tora/extlibs/parsing.cpp/org/antlr/codegen/templates/Cpp/Cpp.stg	2013-09-27 13:31:16 UTC (rev 4855)
+++ trunk/tora/extlibs/parsing.cpp/org/antlr/codegen/templates/Cpp/Cpp.stg	2013-10-02 19:26:12 UTC (rev 4856)
@@ -167,7 +167,7 @@
                return (ANTLR_UINT8*) "\<EOF>";
        return TokenNames[index];
 }
-
+ 
 /** \brief Table of all token names in symbolic order, mainly used for debugging.
  */
 ANTLR_UINT8* <name>Tokens::TokenNames[<length(tokens)>+4]
@@ -379,7 +379,7 @@
 	};
 <if(LEXER)>
        const ANTLR_UINT8* getTokenName(ANTLR_INT32 index) const;
-
+ 
 protected:
        static ANTLR_UINT8* TokenNames[];
 <endif>
@@ -1211,7 +1211,7 @@
     :{it |<labelType> <it.label.text> = NULL;}; separator="\n"
 >
 <[ruleDescriptor.tokenListLabels,ruleDescriptor.ruleListLabels,ruleDescriptor.wildcardTreeListLabels]
-    :{it |ImplTraits::TokenPtrsListType list_<it.label.text>;}; separator="\n"
+    :{it |ImplTraits::TokenListType list_<it.label.text>;}; separator="\n"
 >
 <ruleDescriptor.ruleLabels:ruleLabelDef(); separator="\n">
 >>
@@ -2124,7 +2124,7 @@
  *  state to jump to next if successful.
  */
 cyclicDFAEdge(labelExpr, targetStateNumber, edgeNumber, predicates) ::= <<
-if ( <if(predicates)>(<predicates>) && <endif>(<labelExpr>) )
+if ( (<labelExpr>) <if(predicates)>&& (<predicates>)<endif> )
 {
     s = <targetStateNumber>;
 }<\n>

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