commit 737080baf85882c45bb322ee2191ae5fd9e1283a
author Andreas Huber <andih@google.com> Tue Aug 02 15:38:04 2016 -0700
committer Iliyan Malchev <malchev@google.com> Sat Aug 06 09:02:59 2016 -0700
tree 4b4d8c1f6b1a99430688bdb13cb9cf65a8a5f463
parent b82318c682ec581edd5cc31d04ede1e6cbf0eaaf

Keeping track of imported names, resolve enum storage types, some finetuning.

AST.h

diff --git a/AST.h b/AST.h
index a159c59..c0fe6b0 100644
--- a/AST.h
+++ b/AST.h
@@ -3,6 +3,7 @@
 #define AST_H_
 
 #include <android-base/macros.h>
+#include <set>
 #include <string>
 #include <utils/Vector.h>
 
@@ -38,7 +39,7 @@
     // Look up a type by FQName, "pure" names, i.e. those without package
     // or version are first looked up in the current scope chain.
     // After that lookup proceeds to imports.
-    Type *lookupType(const char *name) const;
+    Type *lookupType(const char *name);
 
     // Takes dot-separated path components to a type possibly inside this AST.
     // Name resolution goes from root scope downwards, i.e. the path must be
@@ -58,6 +59,16 @@
 
     FQName mPackage;
 
+    std::set<FQName> mImportedNames;
+
+    static void GetPackageComponents(
+            const FQName &fqName, std::vector<std::string> *components);
+
+    static void GetPackageAndVersionComponents(
+            const FQName &fqName,
+            std::vector<std::string> *components,
+            bool cpp_compatible);
+
     void getPackageComponents(std::vector<std::string> *components) const;
 
     void getPackageAndVersionComponents(