summaryrefslogtreecommitdiff
path: root/src/ast
diff options
context:
space:
mode:
Diffstat (limited to 'src/ast')
-rw-r--r--src/ast/Python3VisitorImpl.java30
-rw-r--r--src/ast/nodes/ArglistNode.java17
-rw-r--r--src/ast/nodes/AtomNode.java27
-rw-r--r--src/ast/nodes/CompNode.java1
-rw-r--r--src/ast/nodes/DottedNameNode.java6
-rw-r--r--src/ast/nodes/ExprNode.java114
-rw-r--r--src/ast/nodes/ForStmtNode.java4
-rw-r--r--src/ast/nodes/IfNode.java4
-rw-r--r--src/ast/nodes/ImportNode.java14
-rw-r--r--src/ast/nodes/Node.java75
-rw-r--r--src/ast/nodes/TrailerNode.java12
-rw-r--r--src/ast/types/ContinueBreakType.java10
-rw-r--r--src/ast/types/ImportType.java11
13 files changed, 219 insertions, 106 deletions
diff --git a/src/ast/Python3VisitorImpl.java b/src/ast/Python3VisitorImpl.java
index f5b369d..d4b4fbf 100644
--- a/src/ast/Python3VisitorImpl.java
+++ b/src/ast/Python3VisitorImpl.java
@@ -264,10 +264,28 @@ public class Python3VisitorImpl extends Python3ParserBaseVisitor<Node> {
x = new AugassignNode(ctx.SUB_ASSIGN());
} else if (ctx.MULT_ASSIGN() != null) {
x = new AugassignNode(ctx.MULT_ASSIGN());
+ } else if (ctx.AT_ASSIGN() != null) {
+ x = new AugassignNode(ctx.AT_ASSIGN());
} else if (ctx.DIV_ASSIGN() != null) {
x = new AugassignNode(ctx.DIV_ASSIGN());
+ } else if (ctx.MOD_ASSIGN() != null) {
+ x = new AugassignNode(ctx.MOD_ASSIGN());
+ } else if (ctx.AND_ASSIGN() != null) {
+ x = new AugassignNode(ctx.AND_ASSIGN());
+ } else if (ctx.OR_ASSIGN() != null) {
+ x = new AugassignNode(ctx.OR_ASSIGN());
+ } else if (ctx.XOR_ASSIGN() != null) {
+ x = new AugassignNode(ctx.XOR_ASSIGN());
+ } else if (ctx.LEFT_SHIFT_ASSIGN() != null) {
+ x = new AugassignNode(ctx.LEFT_SHIFT_ASSIGN());
+ } else if (ctx.RIGHT_SHIFT_ASSIGN() != null) {
+ x = new AugassignNode(ctx.RIGHT_SHIFT_ASSIGN());
+ } else if (ctx.POWER_ASSIGN() != null) {
+ x = new AugassignNode(ctx.POWER_ASSIGN());
+ } else if (ctx.IDIV_ASSIGN() != null) {
+ x = new AugassignNode(ctx.IDIV_ASSIGN());
}
-
+
return x;
}
@@ -495,7 +513,7 @@ public class Python3VisitorImpl extends Python3ParserBaseVisitor<Node> {
methodCall = ctx.NAME();
}
- return new TrailerNode(arglist, exprs, methodCall);
+ return new TrailerNode(arglist, exprs, methodCall, ctx.OPEN_PAREN() != null);
}
/**
@@ -507,7 +525,13 @@ public class Python3VisitorImpl extends Python3ParserBaseVisitor<Node> {
* ```
*/
public Node visitExprlist(ExprlistContext ctx) {
- Node exp = visit(ctx.expr(0));
+ Node exp;
+
+ if (ctx.expr(0).expr(0) != null){
+ exp = visit(ctx.expr(0).expr(0));
+ } else {
+ exp = visit(ctx.expr(0));
+ }
return exp;
}
diff --git a/src/ast/nodes/ArglistNode.java b/src/ast/nodes/ArglistNode.java
index cd1a403..78b4ca7 100644
--- a/src/ast/nodes/ArglistNode.java
+++ b/src/ast/nodes/ArglistNode.java
@@ -2,6 +2,8 @@ package ast.nodes;
import ast.types.*;
import java.util.ArrayList;
+import java.util.Arrays;
+
import semanticanalysis.SemanticError;
import semanticanalysis.SymbolTable;
@@ -26,9 +28,18 @@ public class ArglistNode implements Node {
// TODO: check fucking IntType for params
// TODO: remove fucking comments
- if (argName != null && !ST.top_lookup(argName) && argExpr.typeCheck() instanceof AtomType) {
- // System.out.println(!(this.typeCheck() instanceof IntType) + " " + !ST.top_lookup(this.getId()));
- errors.add(new SemanticError("'" + argName + "' is not defined."));
+ if (argName != null) {
+ if (Arrays.asList(bif).contains(argName)) {
+ continue;
+ }
+
+ if (ST.lookup(argName) != null && ST.lookup(argName).getType() instanceof ImportType) {
+ continue;
+ }
+
+ if (!ST.top_lookup(argName) && argExpr.typeCheck() instanceof AtomType) {
+ errors.add(new SemanticError("'" + argName + "' is not defined."));
+ }
} else {
errors.addAll(arg.checkSemantics(ST, _nesting));
}
diff --git a/src/ast/nodes/AtomNode.java b/src/ast/nodes/AtomNode.java
index 96132d8..ceafc07 100644
--- a/src/ast/nodes/AtomNode.java
+++ b/src/ast/nodes/AtomNode.java
@@ -26,11 +26,7 @@ public class AtomNode implements Node {
public ArrayList<SemanticError> checkSemantics(SymbolTable ST, int _nesting) {
var errors = new ArrayList<SemanticError>();
- // Print the symbol table
- // System.out.println(ST);
-
if ((this.typeCheck() instanceof AtomType) && ST.nslookup(this.getId()) < 0) {
- // System.out.println(!(this.typeCheck() instanceof IntType) + " " + !ST.top_lookup(this.getId()));
errors.add(new SemanticError("'" + this.getId() + "' is not defined."));
}
@@ -40,15 +36,26 @@ public class AtomNode implements Node {
// ENHANCE: return more specific types
@Override
public Type typeCheck() {
+ Pattern booleanVariable = Pattern.compile("^(True|False)$");
+ Pattern continueBreakVariable = Pattern.compile("^(continue|break)$");
// this regex should match every possible atom name written in this format: CHAR (CHAR | DIGIT)*
- Pattern pattern = Pattern.compile("^[a-zA-Z][a-zA-Z0-9]*$", Pattern.CASE_INSENSITIVE);
- Matcher matcher = pattern.matcher(this.val);
- boolean matchFound = matcher.find();
- if (matchFound) {
- // System.out.println("Match found for " + this.val);
+ Pattern simpleVariable = Pattern.compile("^[a-zA-Z][a-zA-Z0-9]*$", Pattern.CASE_INSENSITIVE);
+
+ Matcher booleanVariableMatcher = booleanVariable.matcher(this.val);
+ Matcher continueBreakVariableMatcher = continueBreakVariable.matcher(this.val);
+ Matcher simpleVariableMatcher = simpleVariable.matcher(this.val);
+
+ boolean matchFoundBoolean = booleanVariableMatcher.find();
+ boolean matchFoundContinueBreak = continueBreakVariableMatcher.find();
+ boolean matchFoundSimpleVariable = simpleVariableMatcher.find();
+
+ if (matchFoundBoolean) {
+ return new BoolType();
+ } else if (matchFoundContinueBreak) {
+ return new ContinueBreakType();
+ } else if (matchFoundSimpleVariable) {
return new AtomType(); // could be a variable or a fuction
} else {
- // System.out.println("Match not found for " + this.val);
return new VoidType(); // could be any type of data
}
}
diff --git a/src/ast/nodes/CompNode.java b/src/ast/nodes/CompNode.java
index f167bf9..8be6ea1 100644
--- a/src/ast/nodes/CompNode.java
+++ b/src/ast/nodes/CompNode.java
@@ -20,7 +20,6 @@ public class CompNode implements Node {
@Override
public ArrayList<SemanticError> checkSemantics(SymbolTable ST, int _nesting) {
- System.out.println("Comp node");
return new ArrayList<SemanticError>();
}
diff --git a/src/ast/nodes/DottedNameNode.java b/src/ast/nodes/DottedNameNode.java
index 46d1b61..df86c99 100644
--- a/src/ast/nodes/DottedNameNode.java
+++ b/src/ast/nodes/DottedNameNode.java
@@ -21,12 +21,16 @@ public class DottedNameNode implements Node {
public ArrayList<SemanticError> checkSemantics(SymbolTable ST, int _nesting) {
ArrayList<SemanticError> errors = new ArrayList<SemanticError>();
+ for (int i = 0; i < names.size(); ++i) {
+ ST.insert(names.get(i).toString(), this.typeCheck(), _nesting, null);
+ }
+
return errors;
}
@Override
public Type typeCheck() {
- return new VoidType();
+ return new ImportType();
}
// NOTE: we do not provide code generation for this node in the same way
diff --git a/src/ast/nodes/ExprNode.java b/src/ast/nodes/ExprNode.java
index 4fbe166..1b20e2e 100644
--- a/src/ast/nodes/ExprNode.java
+++ b/src/ast/nodes/ExprNode.java
@@ -3,6 +3,7 @@ package ast.nodes;
import ast.types.*;
import java.util.ArrayList;
import java.util.Arrays;
+
import semanticanalysis.STentry;
import semanticanalysis.SemanticError;
import semanticanalysis.SymbolTable;
@@ -18,80 +19,6 @@ public class ExprNode implements Node {
private ArrayList<Node> exprs;
private ArrayList<Node> trailers;
- // built-in functions
- private static final String[] bif = {
- "abs",
- "aiter",
- "all",
- "anext",
- "any",
- "ascii",
- "bin",
- "bool",
- "breakpoint",
- "bytearray",
- "bytes",
- "callable",
- "chr",
- "classmethod",
- "compile",
- "complex",
- "delattr",
- "dict",
- "dir",
- "divmod",
- "enumerate",
- "eval",
- "exec",
- "filter",
- "float",
- "format",
- "frozenset",
- "getattr",
- "globals",
- "hasattr",
- "hash",
- "help",
- "hex",
- "id",
- "input",
- "int",
- "isinstance",
- "issubclass",
- "iter",
- "len",
- "list",
- "locals",
- "map",
- "max",
- "memoryview",
- "min",
- "next",
- "object",
- "oct",
- "open",
- "ord",
- "pow",
- "print",
- "property",
- "range",
- "repr",
- "reversed",
- "round",
- "set",
- "setattr",
- "slice",
- "sorted",
- "staticmethod",
- "str",
- "sum",
- "super",
- "tuple",
- "type",
- "vars",
- "zip",
- "__import__"};
-
public ExprNode(Node atom, Node compOp, ArrayList<Node> exprs, String op, ArrayList<Node> trailers) {
this.atom = (AtomNode) atom;
this.compOp = compOp;
@@ -112,19 +39,38 @@ public class ExprNode implements Node {
public ArrayList<SemanticError> checkSemantics(SymbolTable ST, int _nesting) {
ArrayList<SemanticError> errors = new ArrayList<SemanticError>();
+ // check if the atom is a built-in function
if (atom != null && !trailers.isEmpty()) {
- // function call
+
if (!Arrays.asList(bif).contains(atom.getId())) {
+
errors.addAll(atom.checkSemantics(ST, _nesting));
- Node trailer = trailers.get(0);
+
+ TrailerNode trailer = (TrailerNode) trailers.get(0);
String funName = atom.getId();
- STentry s = ST.lookup(funName);
- if (s != null) {
- FunctionType ft = (FunctionType) s.getType();
- int paramNumber = ft.getParamNumber();
- int argNumber = ((TrailerNode) trailer).getArgumentNumber();
- if (paramNumber != argNumber) {
- errors.add(new SemanticError(funName + "() takes " + String.valueOf(paramNumber) + " positional arguments but " + String.valueOf(argNumber) + " were given"));
+
+ // TODO: it isnt a function, it could be a variable
+ STentry fun = ST.lookup(funName);
+
+
+
+ if (fun != null && !(fun.getType() instanceof ImportType)) {
+ if (!(fun.getType() instanceof FunctionType)) {
+ if (trailer.isParenthesis()) {
+ errors.add(new SemanticError("'" + funName + "' is not a function."));
+ } else {
+ for (var t : trailers) {
+ errors.addAll(t.checkSemantics(ST, _nesting));
+ }
+ }
+ } else {
+ FunctionType ft = (FunctionType) fun.getType();
+ int paramNumber = ft.getParamNumber();
+ int argNumber = trailer.getArgumentNumber();
+
+ if (paramNumber != argNumber) {
+ errors.add(new SemanticError(funName + "() takes " + String.valueOf(paramNumber) + " positional arguments but " + String.valueOf(argNumber) + " were given."));
+ }
}
}
} else {
@@ -150,7 +96,7 @@ public class ExprNode implements Node {
// FIXME: type for the expr
@Override
public Type typeCheck() {
- if (this.atom != null) {
+ if (this.atom != null ) {
return this.atom.typeCheck();
}
diff --git a/src/ast/nodes/ForStmtNode.java b/src/ast/nodes/ForStmtNode.java
index 6d94bb2..28fe783 100644
--- a/src/ast/nodes/ForStmtNode.java
+++ b/src/ast/nodes/ForStmtNode.java
@@ -22,6 +22,10 @@ public class ForStmtNode implements Node {
public ArrayList<SemanticError> checkSemantics(SymbolTable ST, int _nesting) {
ArrayList<SemanticError> errors = new ArrayList<SemanticError>();
+ ExprNode expr = (ExprNode) exprList;
+
+ ST.insert(expr.getId(), expr.typeCheck(), _nesting, "");
+
errors.addAll(exprList.checkSemantics(ST, _nesting));
errors.addAll(block.checkSemantics(ST, _nesting));
diff --git a/src/ast/nodes/IfNode.java b/src/ast/nodes/IfNode.java
index 772041b..f51d486 100644
--- a/src/ast/nodes/IfNode.java
+++ b/src/ast/nodes/IfNode.java
@@ -41,11 +41,11 @@ public class IfNode implements Node {
if (thenexp.getClass().equals(elseexp.getClass()))
return thenexp;
else {
- System.out.println("Type Error: incompatible types in then and else branches");
+ System.out.println("Type Error: incompatible types in then and else branches.");
return new ErrorType();
}
} else {
- System.out.println("Type Error: non boolean condition in if");
+ System.out.println("Type Error: non boolean condition in if.");
return new ErrorType();
}
}
diff --git a/src/ast/nodes/ImportNode.java b/src/ast/nodes/ImportNode.java
index e264c99..900a909 100644
--- a/src/ast/nodes/ImportNode.java
+++ b/src/ast/nodes/ImportNode.java
@@ -29,12 +29,24 @@ public class ImportNode implements Node {
public ArrayList<SemanticError> checkSemantics(SymbolTable ST, int _nesting) {
ArrayList<SemanticError> errors = new ArrayList<SemanticError>();
+ if (isFrom) {
+ for (int i = 0; i < names.size(); ++i) {
+ ST.insert(names.get(i), this.typeCheck(), _nesting, null);
+ }
+ } else {
+ errors.addAll(dottedName.checkSemantics(ST, _nesting));
+ }
+
+ if (importAs) {
+ ST.insert(names.get(names.size() - 1), this.typeCheck(), _nesting, null);
+ }
+
return errors;
}
@Override
public Type typeCheck() {
- return new VoidType();
+ return new ImportType();
}
// NOTE: we do not want to provide a code generation for this statement
diff --git a/src/ast/nodes/Node.java b/src/ast/nodes/Node.java
index 949531e..77ba669 100644
--- a/src/ast/nodes/Node.java
+++ b/src/ast/nodes/Node.java
@@ -10,6 +10,81 @@ import ast.types.*;
* Base interface for a Node.
*/
public interface Node {
+
+ static final String[] bif = {
+ "abs",
+ "aiter",
+ "all",
+ "anext",
+ "any",
+ "ascii",
+ "bin",
+ "bool",
+ "breakpoint",
+ "bytearray",
+ "bytes",
+ "callable",
+ "chr",
+ "classmethod",
+ "compile",
+ "complex",
+ "delattr",
+ "dict",
+ "dir",
+ "divmod",
+ "enumerate",
+ "eval",
+ "exec",
+ "exit",
+ "filter",
+ "float",
+ "format",
+ "frozenset",
+ "getattr",
+ "globals",
+ "hasattr",
+ "hash",
+ "help",
+ "hex",
+ "id",
+ "input",
+ "int",
+ "isinstance",
+ "issubclass",
+ "iter",
+ "len",
+ "list",
+ "locals",
+ "map",
+ "max",
+ "memoryview",
+ "min",
+ "next",
+ "object",
+ "oct",
+ "open",
+ "ord",
+ "pow",
+ "print",
+ "property",
+ "range",
+ "repr",
+ "reversed",
+ "round",
+ "set",
+ "setattr",
+ "slice",
+ "sorted",
+ "staticmethod",
+ "str",
+ "sum",
+ "super",
+ "tuple",
+ "type",
+ "vars",
+ "zip",
+ "__import__"};
+
/**
* Checks semantics for a given node for a SymbolTable ST and a level of
* nesting.
diff --git a/src/ast/nodes/TrailerNode.java b/src/ast/nodes/TrailerNode.java
index 850b8e8..22e43a0 100644
--- a/src/ast/nodes/TrailerNode.java
+++ b/src/ast/nodes/TrailerNode.java
@@ -15,12 +15,14 @@ public class TrailerNode implements Node {
private Node arglist;
private ArrayList<Node> exprs;
private TerminalNode methodCall;
+ private boolean isParenthesis;
private boolean isEmpty;
- public TrailerNode(Node arglist, ArrayList<Node> exprs, TerminalNode methodCall) {
+ public TrailerNode(Node arglist, ArrayList<Node> exprs, TerminalNode methodCall, boolean isParenthesis) {
this.arglist = arglist;
this.exprs = exprs;
this.methodCall = methodCall;
+ this.isParenthesis = isParenthesis;
this.isEmpty = (this.arglist == null && this.exprs.size() == 0 && this.methodCall == null);
}
@@ -41,9 +43,17 @@ public class TrailerNode implements Node {
}
public int getArgumentNumber() {
+ if (arglist == null) {
+ return 0;
+ }
+
return ((ArglistNode) arglist).getArgumentNumber();
}
+ public boolean isParenthesis() {
+ return this.isParenthesis;
+ }
+
@Override
public Type typeCheck() {
return new VoidType();
diff --git a/src/ast/types/ContinueBreakType.java b/src/ast/types/ContinueBreakType.java
new file mode 100644
index 0000000..dfcf1f2
--- /dev/null
+++ b/src/ast/types/ContinueBreakType.java
@@ -0,0 +1,10 @@
+package ast.types;
+
+/**
+ * A type for the continue and break statements.
+ */
+public class ContinueBreakType extends Type {
+ public String toPrint(String prefix) {
+ return prefix + "ContinueBreak\n";
+ }
+}
diff --git a/src/ast/types/ImportType.java b/src/ast/types/ImportType.java
new file mode 100644
index 0000000..6852bfa
--- /dev/null
+++ b/src/ast/types/ImportType.java
@@ -0,0 +1,11 @@
+package ast.types;
+
+/**
+ * A type for the imported names.
+ */
+public class ImportType extends Type {
+ public String toPrint(String prefix) {
+ return prefix + "Import\n";
+ }
+}
+
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2025-04-04 11:12:26 +0000