Changeset 22873 for src

Timestamp:

11/04/08 18:27:47 (2 months ago)

Author:

azawawi

Message:

[STD_syntax_highlight] re-factored --simple-html for easier support of
[STD_syntax_highlight] future output formats

Files:

• src/perl6/STD_syntax_highlight (modified) (4 diffs)

src/perl6/STD_syntax_highlight

@@ -307 +307 @@
 HTML
 
+    local *spit_simple_html = sub {
+        my ($buffer, $rule) = @ARG;
+        if($rule) {
+            $str .= qq{<span class="$rule">$buffer</span>};
+        } else {
+            $str .= $buffer;
+        }
+    };
+
+    redspans_traverse(\&spit_simple_html,%colors); 
+
+    $str .= <<"HTML";
+    </pre>
+</body>
+</html>
+HTML
+
+   $str;
+}
+
+=item redspans_traverse
+    XXX- document
+=cut
+sub redspans_traverse($%) {
+    my ($process_buffer,%colors) = @ARG;
+
     my ($last_tree,$buffer) = ("","");
     for my $i (0 .. @loc-1) {
@@ -318 +344 @@
             my $rule;
             my $rule_to_color = 0;
-            $buffer = escape_html($buffer);
+            $buffer = $buffer;
             my @rules = ();
             @rules = reverse(split / /,$last_tree) if $last_tree ne '';
@@ -333 +359 @@
                 if($last_tree =~ /identifier/) {
                     if($parser->is_type($buffer)) {
-                        $str .= qq{<span class="_type">$buffer</span>};
+                        $rule_to_color = '_type';
                     } elsif($parser->is_routine($buffer)) {
-                        $str .= qq{<span class="_routine">$buffer</span>};
-                    } else {
-                        $str .= qq{<span class="$rule_to_color">$buffer</span>};
-                    }
-                } else {              
-                    $str .= qq{<span class="$rule_to_color">$buffer</span>};
-                }
-            } else {
-                $str .= qq{$buffer};
+                        $rule_to_color = '_routine';
+                    } 
+                }              
             }
+            #now delegate printing to a callback
+            $process_buffer->($buffer, $rule_to_color); 
             $buffer = $c;
         } else {
@@ -351 +373 @@
         $last_tree = $tree;
     }
-    $str .= <<"HTML";
-    </pre>
-</body>
-</html>
-HTML
-
-   $str;
 }