Changeset 828 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/include/LexicalAnalyzer.h

Timestamp:

Mar 19, 2012, 1:59:48 AM (12 years ago)

Author:

イグトランス (egtra)

Message:

egtraブランチの内容をマージ。

Location:

trunk

Files:

• . (modified) (1 prop)
• ab5.0/abdev (modified) (1 prop)
• ab5.0/abdev/BasicCompiler_Common/include/LexicalAnalyzer.h (modified) (3 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/include/LexicalAnalyzer.h

@@ +1 @@
+#include <string>
+
 #pragma once
+
+class EnumInfo;
+class EnumInfoCollection;
 
 namespace ActiveBasic{ namespace Compiler{
@@ -24 +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 );
 
@@ -30 +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);
+    }
 
     // クラスを収集する