commit 9a7f21ffcba1fa18516ca6e9bf0afb8b653ab166
author Jeongik Cha <jeongik@google.com> Wed Feb 13 14:42:47 2019 +0900
committer Jeongik Cha <jeongik@google.com> Wed Feb 13 16:19:11 2019 +0900
tree dff33395d5649d240708d0fa356990ec936e5f0b
parent 439f2c4636a8330603b68afc1fcb95dcea266835

clean up ast_java: NewExpression, NewArrayExpression, Cast, VariableDeclaration

ast_java doesn't need to know about Type in JavaTypeNamespace.

This commit removes Type in NewExpression, NewArrayExpression, Cast, VariableDeclaration
And make it not include "type_java.h" anymore.

Bug: 110967839
Test: ./runtests.sh
Test: m -j
Change-Id: I1700d936780ab9c7ca4c2411d4687010a28590ad

ast_java.cpp

diff --git a/ast_java.cpp b/ast_java.cpp
index 1dd3818..ab297ef 100644
--- a/ast_java.cpp
+++ b/ast_java.cpp
@@ -15,9 +15,7 @@
  */
 
 #include "ast_java.h"
-
 #include "code_writer.h"
-#include "type_java.h"
 
 using std::vector;
 using std::string;
@@ -237,9 +235,9 @@
   to->Write(")");
 }
 
-NewExpression::NewExpression(const Type* t) : type(t) {}
+NewExpression::NewExpression(const std::string& n) : instantiableName(n) {}
 
-NewExpression::NewExpression(const Type* t, int argc = 0, ...) : type(t) {
+NewExpression::NewExpression(const std::string& n, int argc = 0, ...) : instantiableName(n) {
   va_list args;
   va_start(args, argc);
   init(argc, args);
@@ -254,31 +252,28 @@
 }
 
 void NewExpression::Write(CodeWriter* to) const {
-  to->Write("new %s(", this->type->InstantiableName().c_str());
+  to->Write("new %s(", this->instantiableName.c_str());
   WriteArgumentList(to, this->arguments);
   to->Write(")");
 }
 
-NewArrayExpression::NewArrayExpression(const Type* t, Expression* s)
-    : type(t), size(s) {}
+NewArrayExpression::NewArrayExpression(const std::string& t, Expression* s) : type(t), size(s) {}
 
 void NewArrayExpression::Write(CodeWriter* to) const {
-  to->Write("new %s[", this->type->JavaType().c_str());
+  to->Write("new %s[", this->type.c_str());
   size->Write(to);
   to->Write("]");
 }
 
-Cast::Cast(const Type* t, Expression* e) : type(t), expression(e) {}
+Cast::Cast(const std::string& t, Expression* e) : type(t), expression(e) {}
 
 void Cast::Write(CodeWriter* to) const {
-  to->Write("((%s)", this->type->JavaType().c_str());
+  to->Write("((%s)", this->type.c_str());
   expression->Write(to);
   to->Write(")");
 }
 
-VariableDeclaration::VariableDeclaration(Variable* l, Expression* r,
-                                         const Type* c)
-    : lvalue(l), cast(c), rvalue(r) {}
+VariableDeclaration::VariableDeclaration(Variable* l, Expression* r) : lvalue(l), rvalue(r) {}
 
 VariableDeclaration::VariableDeclaration(Variable* l) : lvalue(l) {}
 
@@ -286,9 +281,6 @@
   this->lvalue->WriteDeclaration(to);
   if (this->rvalue != nullptr) {
     to->Write(" = ");
-    if (this->cast != nullptr) {
-      to->Write("(%s)", this->cast->JavaType().c_str());
-    }
     this->rvalue->Write(to);
   }
   to->Write(";\n");