A few changes to be more Rock friendly

joshthecoder · joshthecoder · commit d85a77abc8e0 · 2010-04-11T17:31:50.000-05:00
diff --git a/mustang/Escape.ooc b/mustang/Escape.ooc
@@ -1,31 +1,29 @@
 import text/Buffer
 
-String: cover from Char* {
-    /**
-        Escape < > & " ' characters in the string.
-    */
-    escapeHTML: func -> This {
-        // Allocate a buffer to hold the escaped string
-        // as we build it. Give it some extra space since
-        // each escaped char will increase length.
-        // Hopefully this will help avoid re-sizes most of the time.
-        escaped := Buffer new(this length() + 128)
+/**
+    Escape < > & " ' characters in the string.
+*/
+escapeHTML: func(text: String) -> String {
+    // Allocate a buffer to hold the escaped string
+    // as we build it. Give it some extra space since
+    // each escaped char will increase length.
+    // Hopefully this will help avoid re-sizes most of the time.
+    escaped := Buffer new(text length() + 128)
 
-        for(c: Char in this) {
-            e: String = match c {
-                case '<' => "&lt;"
-                case '>' => "&gt;"
-                case '&' => "&amp;"
-                case '"' => "&quot;"
-                case '\'' => "&apos;"
-                case =>
-                    escaped append(c)
-                    continue
-                    "null"
-            }
-            escaped append(e)
+    for(c: Char in text) {
+        e: String = match c {
+            case '<' => "&lt;"
+            case '>' => "&gt;"
+            case '&' => "&amp;"
+            case '"' => "&quot;"
+            case '\'' => "&apos;"
+            case =>
+                escaped append(c)
+                continue
+                "null"
         }
-
-        return escaped toString()
+        escaped append(e)
     }
+
+    return escaped toString()
 }
diff --git a/mustang/Node.ooc b/mustang/Node.ooc
@@ -53,7 +53,7 @@ VariableNode: class extends TNode {
         variableText := variable emit()
         if(escape) {
             // Escape any HTML in the text
-            variableText = variableText escapeHTML()
+            variableText = escapeHTML(variableText)
         }
 
         // Write variable text to output stream
diff --git a/mustang/YAMLContext.ooc b/mustang/YAMLContext.ooc
@@ -33,7 +33,9 @@ YAMLContext: class extends Context {
     }
 
     nodeToValue: static func(node: DocumentNode) -> Value {
-        match node class {
+        nodeType := node class
+
+        match nodeType {
             case ScalarNode => scalarToValue(node as ScalarNode)
             case SequenceNode => sequenceToListValue(node as SequenceNode)
             case MappingNode => mappingToHashValue(node as MappingNode)

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ VariableNode: class extends TNode {`
`53`	`53`	`variableText := variable emit()`
`54`	`54`	`if(escape) {`
`55`	`55`	`// Escape any HTML in the text`
`56`		`- variableText = variableText escapeHTML()`
	`56`	`+ variableText = escapeHTML(variableText)`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`// Write variable text to output stream`