Changeset 814 in dev for branches/egtra/ab5.0/abdev/BasicCompiler_Common/include

Timestamp:

Mar 19, 2011, 1:29:12 AM (14 years ago)

Author:

イグトランス (egtra)

Message:

LexicalAnalyzer周りの修正

File:

• branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/LexicalAnalyzer.h (modified) (2 diffs)

branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/LexicalAnalyzer.h

@@ -29 +29 @@
 
     // TypeDefを収集する
-    static void AddTypeDef( TypeDefCollection &typeDefs, const NamespaceScopes &namespaceScopes, const std::string &expression, int nowLine );
+    static void AddTypeDef( TypeDefCollection &typeDefs, const NamespaceScopes &namespaceScopes, const boost::iterator_range<char const*> &expression, int nowLine );
     static void CollectTypeDefs( const char *source, TypeDefCollection &typeDefs );
 
@@ -35 +35 @@
     static void AddConstEnum( Consts &consts, const NamespaceScopes &namespaceScopes, const char *buffer );
     static void CollectConsts( const char *source, Consts &consts, ConstMacros &constMacros );
-    static bool ConstMacroToExpression( const ConstMacro &constMacro, const char *parameterStr, char *dest );
+    static bool ConstMacroToExpression( const ConstMacro &constMacro, const char *parameterStr, std::string& dest );
+    static bool ConstMacroToExpression( const ConstMacro &constMacro, const char *parameterStr, char *dest, std::size_t destSize );
+    template<std::size_t N>
+    static bool ConstMacroToExpression( const ConstMacro &constMacro, const char *parameterStr, char (&dest)[N] )
+    {
+        return ConstMacroToExpression(constMacro, parameterStr, dest, N);
+    }
 
     // クラスを収集する