Get boolean sections working.

joshthecoder · joshthecoder · commit 53f384e609b5 · 2010-03-12T00:14:24.000-06:00
diff --git a/mustang/Context.ooc b/mustang/Context.ooc
@@ -22,6 +22,8 @@ BoolValue: class extends Value {
 
     type: func -> String { "Bool" }
     toString: func -> String { value toString() }
+
+    isTrue: func -> Bool { value }
 }
 
 ListValue: class <T> extends Value {
@@ -37,7 +39,7 @@ ListValue: class <T> extends Value {
 
 Context: abstract class {
     add: abstract func(name: String, value: Value)
-    get: abstract func(name: String, value: Value)
+    get: abstract func(name: String) -> Value
 
     addString: func(name: String, value: String) {
         add(name, StringValue new(value))
diff --git a/mustang/Node.ooc b/mustang/Node.ooc
@@ -1,5 +1,5 @@
 import io/Writer
-import mustang/Context
+import mustang/[Context, Renderer]
 
 /**
     Base template node interface.
@@ -34,19 +34,39 @@ VariableNode: class extends TNode {
 
     render: func(context: Context, out: Writer) {
         variable := context get(variableName)
+        if(!variable) {
+            Exception new("Variable '%s' not found in context!" format(variableName)) throw()
+        }
+
         out write(variable toString())
     }
 
     debug: func -> String { "Variable: name=%s" format(variableName) }
 }
 
 SectionNode: class extends TNode {
-    name: String
+    variableName: String
 
-    init: func(=name) {}
+    init: func(=variableName) {}
 
     render: func(context: Context, out: Writer) {
+        variable := context get(variableName)
+        if(!variable) {
+            Exception new("Variable '%s' not found in context!" format(variableName)) throw()
+        }
+
+        if(variable type() == "List") {
+        }
+        else if(variable type() == "Bool") {
+            if((variable as BoolValue) isTrue()) {
+                Renderer new(this firstChild, context) render(out)
+            }
+        }
+        else {
+            //TODO: better report this error
+            Exception new("Section variable must be either list or bool!") throw()
+        }
     }
 
-    debug: func -> String { "Section: name=%s" format(name) }
+    debug: func -> String { "Section: name=%s" format(variableName) }
 }
diff --git a/mustang/TagParser.ooc b/mustang/TagParser.ooc
@@ -59,7 +59,8 @@ SectionParser: class extends TagParser {
     isBlock: func -> Bool { true }
 
     parse: func(tag: String) -> TNode {
-        SectionNode new(tag)
+        variableName := tag substring(1). trim()
+        SectionNode new(variableName)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ SectionParser: class extends TagParser {`
`59`	`59`	`isBlock: func -> Bool { true }`
`60`	`60`
`61`	`61`	`parse: func(tag: String) -> TNode {`
`62`		`- SectionNode new(tag)`
	`62`	`+ variableName := tag substring(1). trim()`
	`63`	`+ SectionNode new(variableName)`
`63`	`64`	`}`
`64`	`65`	`}`
`65`	`66`