summaryrefslogtreecommitdiff
path: root/ast.h
diff options
context:
space:
mode:
Diffstat (limited to 'ast.h')
-rw-r--r--ast.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/ast.h b/ast.h
index de30d5a..3eec1a3 100644
--- a/ast.h
+++ b/ast.h
@@ -26,7 +26,7 @@ public:
ostream& operator<<(ostream &os,Site site);
-class Scope{
+class ScopeDef{
public:
enum class Type{
direct,
@@ -41,12 +41,12 @@ public:
Site site;
- Scope();
- Scope(Type type,const StatementList &body,const vector<Expression> &args);
- // Scope(Type type,const StatementList &body,const vector<Name> &args);
+ ScopeDef();
+ ScopeDef(Type type,const StatementList &body,const vector<Expression> &args);
+ // ScopeDef(Type type,const StatementList &body,const vector<Name> &args);
};
-ostream& operator<<(ostream &os,const Scope &scope);
+ostream& operator<<(ostream &os,const ScopeDef &scope);
class Expression{
public:
@@ -66,17 +66,17 @@ public:
vector<Expression> args;
double numval;
string strval;
- Scope scope;
+ ScopeDef scope;
Site site;
// Expression();
Expression(Type type,const Name &name,const vector<Expression> &args); // binop, call
Expression(Type type,const Name &name,const Expression &arg); // unop
- Expression(Type type,const Name &name,const vector<Expression> &args,const Scope &scope); // dive
+ Expression(Type type,const Name &name,const vector<Expression> &args,const ScopeDef &scope); // dive
Expression(Type type,double numval); // number
Expression(Type type,const string &strval); // string
- Expression(Type type,const Scope &scope); // scope
+ Expression(Type type,const ScopeDef &scope); // scope
Expression(Type type,const vector<Expression> &args); // cond
};