IR, beatch

Author: rsms

examples/program1.txt

@@ -1,20 +1,20 @@
 # A function declaration
-math_atan = extern atan2 (a Float, b Float) Float
+atan2 = extern atan2 (a Float, b Float) Float
 
 # A function definition
-foo = func (x, y Float) Float, Float ->
-  6 + x + foo 5 (foo y 4.0)
+foo = func (x, y Float) Float -> 7.2 * x
+#  6 + x + foo 5 (foo y 4.0)
 
 # Call the foo function with a number argument of 40
-foo 10 (foo 10 20) 20
+M = foo 1.0 2.0
 
 # Alias 1983 as "Year"
-Year Int = 1983
-x = 4.9
-y = 3.1 + atan2 x 0.3
-Month = 5
+Year = 1983
+#x = 4.9
+#y = 3.1 + atan2 x 0.3
+Month = Year + M
 
-#Day MUTABLE = foo 3 4.1
+#Day MUTABLE = foo 3.1 4.1
 
 #x Int, y MUTABLE, z MUTABLE Float = ninja2000 34.4
 #MUTABLE y = 8

src/ast/Function.h

@@ -25,14 +25,21 @@ class Argument {
 // Represents the "prototype" for a function, which captures its name, and its
 // argument names (thus implicitly the number of arguments the function takes).
 class FunctionInterface : public Node {
-  VariableList *args_;
-  TypeDeclarationList *returnTypes_;
 public:
-  FunctionInterface(VariableList *args = 0, TypeDeclarationList *returnTypes = 0)
-    : Node(TFunctionInterface), args_(args), returnTypes_(returnTypes) {}
+  FunctionInterface(VariableList *args = 0,
+                    TypeDeclarationList *returnTypes = 0,
+                    bool isPublic = false)
+    : Node(TFunctionInterface), args_(args), returnTypes_(returnTypes), isPublic_(isPublic) {}
 
   VariableList *args() const { return args_; }
   TypeDeclarationList *returnTypes() const { return returnTypes_; }
+  
+  bool isPublic() const { return isPublic_; }
+  void setIsPublic(bool isPublic) { isPublic_ = isPublic; }
+  
+  bool declaresReturnTypes() const {
+    return returnTypes_ != 0 && returnTypes_->size() != 0;
+  }
 
   virtual std::string toString(int level = 0) const {
     std::ostringstream ss;
@@ -59,6 +66,11 @@ class FunctionInterface : public Node {
     ss << '>';
     return ss.str();
   }
+  
+private:
+  VariableList *args_;
+  TypeDeclarationList *returnTypes_;
+  bool isPublic_;
 };
 
 // Represents a function definition.

src/ast/TypeDeclaration.h

@@ -18,6 +18,8 @@ class TypeDeclaration {
   TypeDeclaration(Type type) : type(type) {}
   TypeDeclaration(const std::string& name) : type(Named), name_(name) {}
 
+  const std::string& name() const { return name_; }
+  
   std::string toString() const {
     switch (type) {
       case Named: return name_;

src/ast/Variable.h

@@ -15,6 +15,8 @@ class Variable : public Node {
   const std::string& name() const { return name_; }
 
   TypeDeclaration *type() const { return type_; }
+  bool hasUnknownType() const { return !type_ || type_->type == TypeDeclaration::Unknown; }
+  
   void setType(TypeDeclaration *type) {
     TypeDeclaration *old = type_;
     type_ = type;