Change around Template.Node and subclasses so they take strings inste…

…ad of a Token object
Whiteknight · Aug 24, 2011 · 970809f · 970809f
1 parent 58eb23c
commit 970809f
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 34 deletions.
diff --git a/src/unstable/template/Node.winxed b/src/unstable/template/Node.winxed
@@ -5,18 +5,20 @@ namespace Rosella { namespace Template
     */
     class Node
     {
-        var token; // The String.Tokenizer.Token object
+        var contents;
+        var type;
 
         // Constructor
-        function Node(var token)
+        function Node(string contents, string type)
         {
-            self.token = token;
+            self.contents = contents;
+            self.type = type;
         }
 
         // Get the token type
         function type()
         {
-            return self.token.metadata();
+            return self.type;
         }
 
         // Render contents. Must be subclassed
@@ -25,7 +27,7 @@ namespace Rosella { namespace Template
             Rosella.Error.must_subclass(__CLASS__);
         }
 
-        // assemble this node. Must be subclassed
+        // assemble this node.
         function assemble(var parent_nodes, var current_node)
         {
             current_node.add_child(self);

diff --git a/src/unstable/template/node/Data.winxed b/src/unstable/template/node/Data.winxed
@@ -7,12 +7,12 @@ namespace Rosella { namespace Template { namespace Node
     class Data : Rosella.Template.Node
     {
         // Constructor.
-        function Data(var token) { self.Node(token); }
+        function Data(string contents, string type) { self.Node(contents, type); }
 
         // Get the value from the context and push it onto the output stream
         function render(var engine, var context, var builder)
         {
-            string key = Rosella.String.trim(self.token.data());
+            string key = Rosella.String.trim(self.contents);
             string value = context.get_value(key);
             push(builder, value);
         }

diff --git a/src/unstable/template/node/Eval.winxed b/src/unstable/template/node/Eval.winxed
@@ -10,9 +10,9 @@ namespace Rosella { namespace Template { namespace Node
         const string EVAL_BASE_NAME = "Template_Node_Eval";
 
         // Constructor
-        function Eval(var token)
+        function Eval(string contents, string type)
         {
-            self.Node(token);
+            self.Node(contents, type);
             self.func = null;
         }
 
@@ -21,7 +21,7 @@ namespace Rosella { namespace Template { namespace Node
         function render(var engine, var context, var builder)
         {
             if (self.func == null) {
-                string code = self.token.data();
+                string code = self.contents;
                 self.func = self.compile_func(code);
             }
             var func = self.func;

diff --git a/src/unstable/template/node/Factory.winxed b/src/unstable/template/node/Factory.winxed
@@ -45,9 +45,9 @@ namespace Rosella { namespace Template { namespace Node
         {
             var node;
             if (has_factory)
-                node = Rosella.construct(type_class, token, handler_factory);
+                node = Rosella.construct(type_class, token.data(), token.metadata(), handler_factory);
             else
-                node = Rosella.construct(type_class, token);
+                node = Rosella.construct(type_class, token.data(), token.metadata());
             return node;
         }
     }

diff --git a/src/unstable/template/node/Literal.winxed b/src/unstable/template/node/Literal.winxed
@@ -7,12 +7,12 @@ namespace Rosella { namespace Template { namespace Node
     class Literal : Rosella.Template.Node
     {
         // Constructor.
-        function Literal(var token) { self.Node(token); }
+        function Literal(string contents, string type) { self.Node(contents, type); }
 
         // Render, push the text to the output
         function render(var engine, var context, var builder)
         {
-            push(builder, self.token.data());
+            push(builder, self.contents);
         }
     }
 }}}
diff --git a/src/unstable/template/node/Logic.winxed b/src/unstable/template/node/Logic.winxed
@@ -11,10 +11,10 @@ namespace Rosella { namespace Template { namespace Node
         var logic_name;
 
         // Constructor
-        function Logic(var token, var handler_factory)
+        function Logic(string contents, string type, var handler_factory)
         {
-            self.Node(token);
-            var tokens = self.parse(token.data());
+            self.Node(contents, type);
+            var tokens = self.parse(contents);
             self.logic_name = tokens.shift();
             self.handler = handler_factory.create(self.logic_name, tokens);
         }

diff --git a/src/unstable/template/node/Master.winxed b/src/unstable/template/node/Master.winxed
@@ -12,7 +12,7 @@ namespace Rosella { namespace Template { namespace Node
         // Constructor
         function Master()
         {
-            self.Node(null);
+            self.Node("", "");
             self.children = [];
         }
 

diff --git a/t/template/Context.t b/t/template/Context.t
@@ -13,6 +13,7 @@ class Test_Rosella_Template_Context
         var arg_0 = "foo";
         var arg_1 = "bar";
         obj.set_temporary(arg_0, arg_1);
+        self.assert.equal(obj["foo"], "bar");
     }
 
     function get_value_user_data() {

diff --git a/t/template/Node.t b/t/template/Node.t
@@ -2,26 +2,24 @@ class Test_Rosella_Template_Node
 {
     function test_new()
     {
-        var obj = new Rosella.Template.Node(null);
+        var obj = new Rosella.Template.Node("", "");
         self.assert.not_null(obj);
         self.assert.instance_of(obj, class Rosella.Template.Node);
     }
 
     function type()
     {
         self.status.verify("Test Rosella.Template.Node.type()");
-        var token = new Rosella.String.Tokenizer.Token("foo", "bar", "baz");
-        var obj = new Rosella.Template.Node(token);
+        var obj = new Rosella.Template.Node("foo", "bar");
 
         var result = obj.type();
-        self.assert.equal(result, "baz");
+        self.assert.equal(result, "bar");
     }
 
     function render()
     {
         self.status.verify("Test Rosella.Template.Node.render()");
-        var token = new Rosella.String.Tokenizer.Token("foo", "bar", "baz");
-        var obj = new Rosella.Template.Node(token);
+        var obj = new Rosella.Template.Node("foo", "bar");
 
         self.assert.throws(function() {
             var arg_0 = null;
@@ -34,8 +32,7 @@ class Test_Rosella_Template_Node
     function assemble()
     {
         self.status.verify("Test Rosella.Template.Node.assemble()");
-        var token = new Rosella.String.Tokenizer.Token("foo", "bar", "baz");
-        var obj = new Rosella.Template.Node(token);
+        var obj = new Rosella.Template.Node("foo", "bar");
 
         var nodec = (new Rosella.MockObject.Factory()).create_typed(class Rosella.Template.Node);
         nodec.expect_method("add_child").once().with_args(obj);

diff --git a/t/template/node/Data.t b/t/template/node/Data.t
@@ -1,8 +1,7 @@
 class Test_Rosella_Template_Node_Data
 {
     function test_new() {
-        var token = new Rosella.String.Tokenizer.Token("Foo", "Bar", "Baz");
-        var obj = new Rosella.Template.Node.Data(token);
+        var obj = new Rosella.Template.Node.Data("Foo", "Bar");
         self.assert.not_null(obj);
         self.assert.instance_of(obj, class Rosella.Template.Node.Data);
     }

diff --git a/t/template/node/Eval.t b/t/template/node/Eval.t
@@ -1,8 +1,7 @@
 class Test_Rosella_Template_Node_Eval
 {
     function test_new() {
-        var token = new Rosella.String.Tokenizer.Token("foo", "bar", "baz");
-        var obj = new Rosella.Template.Node.Eval(token);
+        var obj = new Rosella.Template.Node.Eval("foo", "bar");
         self.assert.not_null(obj);
         self.assert.instance_of(obj, class Rosella.Template.Node.Eval);
     }

diff --git a/t/template/node/Literal.t b/t/template/node/Literal.t
@@ -1,8 +1,7 @@
 class Test_Rosella_Template_Node_Literal
 {
     function test_new() {
-        var token = new Rosella.String.Tokenizer.Token("Foo", "Bar", "Baz");
-        var obj = new Rosella.Template.Node.Literal(token);
+        var obj = new Rosella.Template.Node.Literal("Foo", "Bar");
         self.assert.not_null(obj);
         self.assert.instance_of(obj, class Rosella.Template.Node.Literal);
     }

diff --git a/t/template/node/Logic.t b/t/template/node/Logic.t
@@ -2,9 +2,8 @@ class Test_Rosella_Template_Node_Logic
 {
     function test_new() {
         self.status.todo("Figure out how to test this correctly");
-        var token = new Rosella.String.Tokenizer.Token("Foo", "bar", "baz");
         var factory = new Rosella.Template.Handler.Factory({"bar" : new Rosella.Template.Handler});
-        var obj = new Rosella.Template.Node.Logic(token, factory);
+        var obj = new Rosella.Template.Node.Logic("Foo", "bar", factory);
         self.assert.not_null(obj);
         self.assert.instance_of(obj, class Rosella.Template.Node.Logic);
     }