commit da51b8e0dd17a0edcb5c3e72beb65d45ef0ce8b0
author Andreas Huber <andih@google.com> Thu Jul 28 16:00:57 2016 -0700
committer Iliyan Malchev <malchev@google.com> Sat Aug 06 09:02:58 2016 -0700
tree f1a3bf5248f89dab7e7d776417000b0c2d00ebc1
parent 84f89de8395a78577f80db0f860b61a9f2409294

No more "version" keyword, new syntax is "package foo.bar.baz@3.4;"

AST.cpp

diff --git a/AST.cpp b/AST.cpp
index a527b46..7610ba5 100644
--- a/AST.cpp
+++ b/AST.cpp
@@ -45,27 +45,20 @@
     mScanner = scanner;
 }
 
-void AST::setVersion(const char *major, const char *minor) {
-    mVersion = "@";
-    mVersion.append(major);
-    mVersion.append(".");
-    mVersion.append(minor);
-}
-
 bool AST::setPackage(const char *package) {
-    FQName fqName(package);
-    CHECK(fqName.isValid());
+    mPackage.setTo(package);
+    CHECK(mPackage.isValid());
 
-    if (!fqName.package().empty() || !fqName.version().empty()) {
+    if (mPackage.package().empty()
+            || mPackage.version().empty()
+            || !mPackage.name().empty()) {
         return false;
     }
 
-    mPackage = package;
-
     return true;
 }
 
-bool AST::addImport(const char *import) {
+bool AST::addImport(const char * /* import */) {
 #if 0
     CHECK(!importPath->empty());
 
@@ -90,11 +83,14 @@
 }
 
 Type *AST::lookupType(const char *name) {
-    LOG(INFO) << "lookupType " << name;
-
     FQName fqName(name);
     CHECK(fqName.isValid());
 
+    if (fqName.name().empty()) {
+        // Given a package and version???
+        return NULL;
+    }
+
     if (fqName.package().empty() && fqName.version().empty()) {
         // This is just a plain identifier, resolve locally first if possible.
 
@@ -107,7 +103,7 @@
         }
     }
 
-    fqName.applyDefaults(mPackage, mVersion);
+    fqName.applyDefaults(mPackage.package(), mPackage.version());
 
     LOG(INFO) << "lookupType now looking for " << fqName.debugString();