Use inquisitor pattern for pseudo-backend

fasterthanlime · Dec 9, 2013 · 45934fe · 45934fe
1 parent 7791848
commit 45934fe
Show file tree

Hide file tree

Showing 13 changed files with 100 additions and 30 deletions.
diff --git a/source/oc/ast/Access.ooc b/source/oc/ast/Access.ooc
@@ -1,6 +1,7 @@
 
 
 import oc/middle/Resolver
+import Inquisitor
 import Expression, Type, Var, Node, Scope, Statement, FuncDecl
 
 Access: class extends Expression {
@@ -48,4 +49,8 @@ Access: class extends Expression {
         if(marker && !ref global) marker markAccess(this)
     }
 
+    surrender: func (inq: Inquisitor) {
+        inq visitAccess(this)
+    }
+
 }
diff --git a/source/oc/ast/Call.ooc b/source/oc/ast/Call.ooc
@@ -2,6 +2,8 @@
 import structs/[List, ArrayList]
 
 import oc/middle/Resolver
+
+import Inquisitor
 import FuncDecl, Expression, Access, Type
 
 Call: class extends Expression {
@@ -33,4 +35,8 @@ Call: class extends Expression {
         null
     }
 
+    surrender: func (inq: Inquisitor) {
+        inq visitCall(this)
+    }
+
 }
diff --git a/source/oc/ast/FuncDecl.ooc b/source/oc/ast/FuncDecl.ooc
@@ -2,6 +2,8 @@
 import structs/[ArrayList, HashMap]
 
 import oc/middle/Resolver
+
+import Inquisitor
 import Expression, Statement, Scope, Var, Type, Access, Return, Call
 
 FuncDecl: class extends Expression {
@@ -149,4 +151,8 @@ FuncDecl: class extends Expression {
         _type
     }
 
+    surrender: func (inq: Inquisitor) {
+        inq visitFuncDecl(this)
+    }
+
 }
diff --git a/source/oc/ast/Import.ooc b/source/oc/ast/Import.ooc
@@ -1,4 +1,5 @@
 
+import Inquisitor
 import Node, Module
 
 /**
@@ -15,4 +16,8 @@ Import: class extends Node {
 
     init: func (=importName) {}
 
+    surrender: func (inq: Inquisitor) {
+        inq visitImport(this)
+    }
+
 }
diff --git a/source/oc/ast/Inquisitor.ooc b/source/oc/ast/Inquisitor.ooc
@@ -0,0 +1,35 @@
+
+// branches
+import oc/ast/[Node, Expression, Statement]
+
+// leafs
+import oc/ast/[Access, Call, CoverDecl, FuncDecl, Import, Module, NumberLit,
+       Return, Scope, StringLit, Type, Var]
+
+Inquisitor: abstract class {
+
+    visitNode: func (node: Node) {
+        if (!node) return
+        node surrender(this)
+    }
+
+    visitModule: func (m: Module)
+    visitImport: func (i: Import)
+
+    visitCoverDecl: func (cd: CoverDecl)
+    visitFuncDecl: func (e: FuncDecl)
+    visitVar: func (v: Var)
+
+    visitScope: func (s: Scope)
+
+    visitAccess: func (a: Access)
+    visitCall: func (c: Call)
+    visitReturn: func (r: Return)
+
+    visitNumberLit: func (nl: NumberLit)
+    visitStringLit: func (sl: StringLit)
+
+    visitBaseType: func (bt: BaseType)
+
+}
+
diff --git a/source/oc/ast/Node.ooc b/source/oc/ast/Node.ooc
@@ -1,5 +1,6 @@
 
 import oc/middle/Resolver
+import Inquisitor
 
 import Access, Var // for resolveAccess
 
@@ -21,4 +22,8 @@ Node: class {
         // <your ad here>
     }
 
+    surrender: func (inq: Inquisitor) {
+        raise("#{class name} surrender(): stub!")
+    }
+
 }
diff --git a/source/oc/ast/NumberLit.ooc b/source/oc/ast/NumberLit.ooc
@@ -1,5 +1,7 @@
 
 import Expression, Type
+
+import Inquisitor
 import oc/middle/Resolver
 
 /** Different number formats - in sync with nagaqueen's "IntFormat" */
@@ -33,4 +35,8 @@ NumberLit: class extends Expression {
         value
     }
 
+    surrender: func (inq: Inquisitor) {
+        inq visitNumberLit(this)
+    }
+
 }
diff --git a/source/oc/ast/Return.ooc b/source/oc/ast/Return.ooc
@@ -1,5 +1,7 @@
 
 import oc/middle/Resolver
+
+import Inquisitor
 import Statement, Expression
 
 Return: class extends Statement {
@@ -16,4 +18,8 @@ Return: class extends Statement {
         expr ? "return " + expr toString() : "return"
     }
 
+    surrender: func (inq: Inquisitor) {
+        inq visitReturn(this)
+    }
+
 }
diff --git a/source/oc/ast/Scope.ooc b/source/oc/ast/Scope.ooc
@@ -2,6 +2,8 @@
 import structs/[ArrayList, List]
 
 import oc/middle/Resolver
+
+import Inquisitor
 import Node, Statement, Var, Access
 
 Scope: class extends Node {
@@ -61,4 +63,8 @@ Scope: class extends Node {
         "{}"
     }
 
+    surrender: func (inq: Inquisitor) {
+        inq visitScope(this)
+    }
+
 }
diff --git a/source/oc/ast/StringLit.ooc b/source/oc/ast/StringLit.ooc
@@ -1,5 +1,7 @@
 
 import Expression, Type
+
+import Inquisitor
 import oc/middle/Resolver
 
 StringLit: class extends Expression {
@@ -19,4 +21,8 @@ StringLit: class extends Expression {
         "\"" + value + "\""
     }
 
+    surrender: func (inq: Inquisitor) {
+        inq visitStringLit(this)
+    }
+
 }
diff --git a/source/oc/ast/Type.ooc b/source/oc/ast/Type.ooc
@@ -1,6 +1,8 @@
 
 
 import oc/middle/Resolver
+
+import Inquisitor
 import Node, FuncDecl
 
 Type: abstract class extends Node {
@@ -23,6 +25,10 @@ BaseType: class extends Type {
 
     toString: func -> String { name }
 
+    surrender: func (inq: Inquisitor) {
+        inq visitBaseType(this)
+    }
+
 }
 
 VoidType: class extends BaseType {

diff --git a/source/oc/ast/Var.ooc b/source/oc/ast/Var.ooc
@@ -1,6 +1,8 @@
 
 
 import oc/middle/Resolver
+
+import Inquisitor
 import Type, Expression
 
 Var: class extends Expression {
@@ -36,4 +38,8 @@ Var: class extends Expression {
         name + (type ? ": " + type toString() : " :") + (expr ? "= " + expr toString() : "")
     }
 
+    surrender: func (inq: Inquisitor) {
+        inq visitVar(this)
+    }
+
 }
diff --git a/source/oc/backend/pseudo/PseudoBackend.ooc b/source/oc/backend/pseudo/PseudoBackend.ooc
@@ -4,6 +4,7 @@ use oc
 import structs/[HashMap, ArrayList, List]
 
 // ours
+import oc/ast/[Inquisitor]
 import oc/ast/[Module, Node, FuncDecl, Access, Var, Scope, Type,
        Call, StringLit, NumberLit, Statement, Expression, Return, CoverDecl]
 import oc/middle/Resolver
@@ -31,33 +32,17 @@ pseudo_Backend: class extends Backend {
 
 }
 
-PseudoGenerator: class {
+PseudoGenerator: class extends Inquisitor {
 
     module: Module
     params: BuildParams
 
-    map := HashMap<Class, CallBack> new()
-
     init: func (=module, =params) {
-        // setup hooks
-        put(CoverDecl,  |cd| visitCoverDecl(cd as CoverDecl))
-        put(FuncDecl,   |fd| visitFuncDecl(fd as FuncDecl))
-        put(Var,        |v|  visitVar(v as Var))
-        put(Scope,      |s|  visitScope(s as Scope))
-        put(Call,       |c|  visitCall(c as Call))
-        put(BaseType,   |bt| visitBaseType(bt as BaseType))
-        put(Access,     |a|  visitAccess(a as Access))
-        put(NumberLit,  |nl| visitNumberLit(nl as NumberLit))
-
         "-------------------------------------------------" println()
         visitModule(module)
         "-------------------------------------------------" println()
     }
 
-    put: func (T: Class, f: Func (Node)) {
-        map put(T, CallBack new(f))
-    }
-
     visitModule: func (m: Module) {
         "module #{m fullName}" println()
 
@@ -92,19 +77,6 @@ PseudoGenerator: class {
         visitScope(cd body)	
     }
 
-    visitNode: func (n: Node) {
-        if (!n) {
-            "(nil)" print()
-            return
-        }
-        cb := map get(n class)
-        if(cb) {
-            cb f(n)
-        } else {
-            err("Unsupported node type: #{n class name}")
-        }
-    }
-
     visitFuncDecl: func (fd: FuncDecl) {
         if (fd name && !fd name empty?()) {
             fd name print()