Context Value types are now done via Class's

joshthecoder · joshthecoder · commit 2cdf0289ad6e · 2010-03-13T01:46:13.000-06:00
diff --git a/mustang/Context.ooc b/mustang/Context.ooc
@@ -3,7 +3,7 @@ import text/StringTokenizer
 
 
 Value: abstract class {
-    type: abstract func -> String
+    type: abstract func -> Class
     toString: abstract func -> String
 }
 
@@ -12,7 +12,7 @@ StringValue: class extends Value {
 
     init: func(=value) {}
 
-    type: func -> String { "String" }
+    type: func -> Class { String }
     toString: func -> String { value }
 }
 
@@ -21,7 +21,7 @@ BoolValue: class extends Value {
 
     init: func(=value) {}
 
-    type: func -> String { "Bool" }
+    type: func -> Class { Bool }
     toString: func -> String { value toString() }
 
     isTrue: func -> Bool { value }
@@ -32,7 +32,7 @@ ListValue: class extends Value {
 
     init: func(=list) {}
 
-    type: func -> String { "List" }
+    type: func -> Class { List }
     toString: func -> String { "List size=%d" format(list size()) }
 
     list: func -> List<Value> { list }
@@ -43,7 +43,7 @@ HashValue: class extends Value {
 
     init: func(=hash) {}
 
-    type: func -> String { "Hash" }
+    type: func -> Class { HashMap }
     toString: func -> String { "Hash" }
 
     hash: func -> HashMap<Value> { hash }
@@ -90,7 +90,7 @@ Context: class {
         tokenizer := StringTokenizer new(expression, ' ')
         for(name: String in tokenizer) {
             next = currentHash get(name)
-            if(!next || next type() != "Hash") break
+            if(!next || next type() != HashMap) break
 
             currentHash = (next as HashValue) hash()
         }
diff --git a/mustang/Node.ooc b/mustang/Node.ooc
@@ -1,4 +1,5 @@
 import io/Writer
+import structs/[List, HashMap]
 import mustang/[Context, Renderer]
 
 /**
@@ -55,11 +56,11 @@ SectionNode: class extends TNode {
             Exception new("Variable '%s' not found in context!" format(variableName)) throw()
         }
 
-        if(variable type() == "List") {
+        if(variable type() == List) {
             itemContext: Context
 
             for(item: Value in (variable as ListValue) list()) {
-                if(item type() == "Hash") {
+                if(item type() == HashMap) {
                     itemContext = (item as HashValue) toContext()
                 }
                 else {
@@ -70,7 +71,7 @@ SectionNode: class extends TNode {
                 Renderer new(this firstChild) render(itemContext, out)
             }
         }
-        else if(variable type() == "Bool") {
+        else if(variable type() == Bool) {
             if((variable as BoolValue) isTrue()) {
                 Renderer new(this firstChild) render(context, out)
             }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import io/Writer`
	`2`	`+import structs/[List, HashMap]`
`2`	`3`	`import mustang/[Context, Renderer]`
`3`	`4`
`4`	`5`	`/**`
`@@ -55,11 +56,11 @@ SectionNode: class extends TNode {`
`55`	`56`	`Exception new("Variable '%s' not found in context!" format(variableName)) throw()`
`56`	`57`	`}`
`57`	`58`
`58`		`- if(variable type() == "List") {`
	`59`	`+ if(variable type() == List) {`
`59`	`60`	`itemContext: Context`
`60`	`61`
`61`	`62`	`for(item: Value in (variable as ListValue) list()) {`
`62`		`- if(item type() == "Hash") {`
	`63`	`+ if(item type() == HashMap) {`
`63`	`64`	`itemContext = (item as HashValue) toContext()`
`64`	`65`	`}`
`65`	`66`	`else {`
`@@ -70,7 +71,7 @@ SectionNode: class extends TNode {`
`70`	`71`	`Renderer new(this firstChild) render(itemContext, out)`
`71`	`72`	`}`
`72`	`73`	`}`
`73`		`- else if(variable type() == "Bool") {`
	`74`	`+ else if(variable type() == Bool) {`
`74`	`75`	`if((variable as BoolValue) isTrue()) {`
`75`	`76`	`Renderer new(this firstChild) render(context, out)`
`76`	`77`	`}`