Skip to content
Snippets Groups Projects
Commit 2be30942 authored by Xun Yang's avatar Xun Yang
Browse files

Merge branch 'new-new-string' of git.uwaterloo.ca:x299yang/cs444 into new-new-string

parents 7f91acd0 2dbe45d8
No related branches found
No related tags found
2 merge requests!30New new string,!20Master
......@@ -118,7 +118,10 @@ class MethodNode(ASTNode):
for n in nameNodes:
paramNode = ParamNode(n, self.typeName)
self.params.append(paramNode)
self.paramTypes += paramNode.paramType.myType.name
if paramNode.paramType.myType.isArray:
self.paramTypes += paramNode.paramType.myType.name + "Array"
else:
self.paramTypes += paramNode.paramType.myType.name
nameNodes = getParseTreeNodes(['type', 'VOID'], parseTree, ['methodBody', 'params'])
for n in nameNodes:
......
......@@ -128,7 +128,7 @@ class LiteralNode(ASTNode):
# 4. call String::String(char[] chars)
label = "M_String_String_char"
label = "M_String_String_charArray"
self.code += importHelper(classDef.name, self.typeName, label)
self.code += p(instruction="call", arg1=label, comment="Calling constructor")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment