commit 8f6816ea1fb532cff9ce0ecc1449926553b4e1da
author Christopher Wiley <wiley@google.com> Tue Sep 22 17:03:47 2015 -0700
committer Christopher Wiley <wiley@google.com> Wed Sep 23 15:48:22 2015 -0700
tree 67ab00745513f9e644a3048e75f580866cc596b9
parent 3637a4d41d9dd1669d92127212fb4822a315ab76

Don't allow non-const pointers to Type instances

This makes the namespace into a read only datastructure of types
with a few methods to load types during parsing.

Bug: 24303749
Test: compiles, unittests

Change-Id: I0873e520d771b348a1a8ec9515b6e7b9a8a29298

ast_java.h

diff --git a/ast_java.h b/ast_java.h
index b9c898e..401018b 100644
--- a/ast_java.h
+++ b/ast_java.h
@@ -57,7 +57,7 @@
     ClassElement();
     virtual ~ClassElement();
 
-    virtual void GatherTypes(set<Type*>* types) const = 0;
+    virtual void GatherTypes(set<const Type*>* types) const = 0;
     virtual void Write(CodeWriter* to) const = 0;
 };
 
@@ -88,16 +88,16 @@
 
 struct Variable : public Expression
 {
-    Type* type;
+    const Type* type;
     string name;
     int dimension;
 
     Variable();
-    Variable(Type* type, const string& name);
-    Variable(Type* type, const string& name, int dimension);
+    Variable(const Type* type, const string& name);
+    Variable(const Type* type, const string& name, int dimension);
     virtual ~Variable();
 
-    virtual void GatherTypes(set<Type*>* types) const;
+    virtual void GatherTypes(set<const Type*>* types) const;
     void WriteDeclaration(CodeWriter* to) const;
     void Write(CodeWriter* to) const;
 };
@@ -105,11 +105,11 @@
 struct FieldVariable : public Expression
 {
     Expression* object;
-    Type* clazz;
+    const Type* clazz;
     string name;
 
     FieldVariable(Expression* object, const string& name);
-    FieldVariable(Type* clazz, const string& name);
+    FieldVariable(const Type* clazz, const string& name);
     virtual ~FieldVariable();
 
     void Write(CodeWriter* to) const;
@@ -126,7 +126,7 @@
     Field(int modifiers, Variable* variable);
     virtual ~Field();
 
-    virtual void GatherTypes(set<Type*>* types) const;
+    virtual void GatherTypes(set<const Type*>* types) const;
     virtual void Write(CodeWriter* to) const;
 };
 
@@ -172,7 +172,7 @@
 struct MethodCall : public Expression
 {
     Expression* obj;
-    Type* clazz;
+    const Type* clazz;
     string name;
     vector<Expression*> arguments;
     vector<string> exceptions;
@@ -180,9 +180,9 @@
     MethodCall(const string& name);
     MethodCall(const string& name, int argc, ...);
     MethodCall(Expression* obj, const string& name);
-    MethodCall(Type* clazz, const string& name);
+    MethodCall(const Type* clazz, const string& name);
     MethodCall(Expression* obj, const string& name, int argc, ...);
-    MethodCall(Type* clazz, const string& name, int argc, ...);
+    MethodCall(const Type* clazz, const string& name, int argc, ...);
     virtual ~MethodCall();
     virtual void Write(CodeWriter* to) const;
 
@@ -203,11 +203,11 @@
 
 struct NewExpression : public Expression
 {
-    Type* type;
+    const Type* type;
     vector<Expression*> arguments;
 
-    NewExpression(Type* type);
-    NewExpression(Type* type, int argc, ...);
+    NewExpression(const Type* type);
+    NewExpression(const Type* type, int argc, ...);
     virtual ~NewExpression();
     virtual void Write(CodeWriter* to) const;
 
@@ -217,10 +217,10 @@
 
 struct NewArrayExpression : public Expression
 {
-    Type* type;
+    const Type* type;
     Expression* size;
 
-    NewArrayExpression(Type* type, Expression* size);
+    NewArrayExpression(const Type* type, Expression* size);
     virtual ~NewArrayExpression();
     virtual void Write(CodeWriter* to) const;
 };
@@ -239,11 +239,11 @@
 
 struct Cast : public Expression
 {
-    Type* type;
+    const Type* type;
     Expression* expression;
 
     Cast();
-    Cast(Type* type, Expression* expression);
+    Cast(const Type* type, Expression* expression);
     virtual ~Cast();
     virtual void Write(CodeWriter* to) const;
 };
@@ -251,11 +251,11 @@
 struct VariableDeclaration : public Statement
 {
     Variable* lvalue;
-    Type* cast;
+    const Type* cast;
     Expression* rvalue;
 
     VariableDeclaration(Variable* lvalue);
-    VariableDeclaration(Variable* lvalue, Expression* rvalue, Type* cast = NULL);
+    VariableDeclaration(Variable* lvalue, Expression* rvalue, const Type* cast = NULL);
     virtual ~VariableDeclaration();
     virtual void Write(CodeWriter* to) const;
 };
@@ -340,17 +340,17 @@
 {
     string comment;
     int modifiers;
-    Type* returnType;
+    const Type* returnType;
     size_t returnTypeDimension;
     string name;
     vector<Variable*> parameters;
-    vector<Type*> exceptions;
+    vector<const Type*> exceptions;
     StatementBlock* statements;
 
     Method();
     virtual ~Method();
 
-    virtual void GatherTypes(set<Type*>* types) const;
+    virtual void GatherTypes(set<const Type*>* types) const;
     virtual void Write(CodeWriter* to) const;
 };
 
@@ -364,15 +364,15 @@
     string comment;
     int modifiers;
     int what;               // CLASS or INTERFACE
-    Type* type;
-    Type* extends;
-    vector<Type*> interfaces;
+    const Type* type;
+    const Type* extends;
+    vector<const Type*> interfaces;
     vector<ClassElement*> elements;
 
     Class();
     virtual ~Class();
 
-    virtual void GatherTypes(set<Type*>* types) const;
+    virtual void GatherTypes(set<const Type*>* types) const;
     virtual void Write(CodeWriter* to) const;
 };
 
@@ -381,7 +381,7 @@
     string comment;
     string package;
     string originalSrc;
-    set<Type*> imports;
+    set<const Type*> imports;
     vector<Class*> classes;
 
     Document();