Changeset 22829 for src

Timestamp:

10/30/08 18:44:51 (2 months ago)

Author:

azawawi

Message:

[STD_syntax_highlight] converted CSS to one liners
[STD_syntax_highlight] redspans identifies routines and types like --simple

Location:

src/perl6

Files:

• STD_syntax_highlight (modified) (3 diffs)
• STD_syntax_highlight.css (modified) (1 diff)

src/perl6/STD_syntax_highlight

@@ -260 +260 @@
         or die "Could not open $CSS: $OS_ERROR\n";
     my $line;
-    my $css_class;
     while($line = <CSS_FILE>) {
-        if($line =~ /^\s*\.(\w+)/) {
-            $css_class = $1;
-        } elsif($line =~ /^#\w+/) {
-            # ignore #elem colors
-            $css_class = 0;
-        } elsif($line =~ /color\s*:\s*(\w+)/) {
-            $colors{$css_class} = $1 if $css_class;
+        if($line =~ /^\s*\.(\w+)\s*{\s*color\s*:\s*(\w+)/) {
+            $colors{$1} = $2;
         }
     }
@@ -352 +346 @@
         or die "Could not open $CSS: $OS_ERROR\n";
     my $line;
-    my $css_class;
     while($line = <CSS_FILE>) {
-        if($line =~ /^\s*\.(\w+)/) {
-            $css_class = $1;
-        } elsif($line =~ /^#\w+/) {
-            # ignore #elem colors
-            $css_class = 0;
-        } elsif($line =~ /color\s*:\s*(\w+)/) {
-            $colors{$css_class} = $1 if $css_class;
+        if($line =~ /^\s*\.(\w+)\s*{\s*color\s*:\s*(\w+)/) {
+            $colors{$1} = $2;
         }
     }
@@ -405 +393 @@
             }
             if($rule_to_color) {
-                $str .= qq{<span class='$rule_to_color'>$buffer</span>};
+                if($last_tree =~ /identifier/) {
+                    if($parser->is_type($buffer)) {
+                        $str .= qq{<span class="_type">$buffer</span>};
+                    } 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};

src/perl6/STD_syntax_highlight.css

@@ -1 @@
-.comp_unit {
-    color: Blue;
-}
-.scope_declarator {
-    color: DarkRed;
-}
-.routine_declarator {
-    color: DarkRed;
-}
-.regex_declarator {
-    color: DarkRed;
-}
-.statement_control {
-    color: DarkRed;
-}
-.block {
-    color: Black;
-}
-.regex_block {
-    color: Black;
-}
-.noun {
-    color: Black;
-}
-.sigil {
-    color: DarkGreen;
-}
-.variable {
-    color: DarkGreen;
-}
-.assertion {
-    color: Darkgreen;
-}
-.quote {
-    color: Brown;
-}   
-.number {
-    color: DarkOrange;
-}
-.infix {
-    color: DimGray;
-}
-.methodop {
-    color: black;
-    font-weight: bold;
-}
+.comp_unit { color: Blue; }
+.scope_declarator { color: DarkRed; }
+.routine_declarator { color: DarkRed; }
+.regex_declarator { color: DarkRed; }
+.statement_control { color: DarkRed; }
+.block { color: Black; }
+.regex_block { color: Black; }
+.noun { color: Black; }
+.sigil { color: DarkGreen; }
+.variable { color: DarkGreen; } 
+.assertion { color: Darkgreen; }
+.quote { color: Brown; }   
+.number { color: DarkOrange; }
+.infix { color: DimGray; }
+.methodop { color: black; font-weight: bold; }
 
-._routine {
-    color: DarkRed;
-    font-weight: bold;
-}
-._type {
-    color: DarkBlue;
-    font-weight: bold;
-}
-._comment {
-    color: DarkGreen;
-    font-weight: bold;
-}
+._routine { color: DarkRed; font-weight: bold; }
+._type { color: DarkBlue; font-weight: bold; }
+._comment { color: DarkGreen; font-weight: bold; }
 
-#parse_tree {
-    position: absolute;
-    right: 10px;
-    top: 10px;
-    font: 14px Verdana;
-}
-#parse_tree_output {
-    color: black;
-    background-color: #FFF5DF;
-    border: 1px solid orange;
-    opacity: 0.7;
-}
+#parse_tree { position: absolute; right: 10px; top: 10px; font: 14px Verdana; }
+#parse_tree_output { color: black; background-color: #FFF5DF; border: 1px solid Orange; }