Changeset 23020 for src

Timestamp:

11/15/08 09:28:25 (8 weeks ago)

Author:

azawawi

Message:

[STD_syntax_highlight] Read from stdin when no filename is given or is '-'
[STD_syntax_highlight] Default output mode is ansi-escaped sequences (--ansi-text)
[STD_syntax_highlight] Replaced $parser->parseFile($file) with parse($file_text)
[STD_syntax_highlight] # slurp file once instead of twice
[STD_syntax_highlight] Updated pod comments along with usage

Files:

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

src/perl6/STD_syntax_highlight

@@ -23 +23 @@
 =head1 SYNOPSIS
 
-    # print html output with inlined resources for 'comp_unit'
+    # read from standard input
+    STD_syntax_highlight
+
+    # print ansi-escaped text for 'comp_unit'
     STD_syntax_highlight foo.pl
 
     # print separate html, css and javascript files
-    STD_syntax_highlight --clean-html foo.pl
-
-    # print html for with 'statementlist' as the top-level rule
+    STD_syntax_highlight --full-html=foo.full.html --clean-html foo.pl
+
+    # print ansi-escaped text for with 'statementlist' as the top-level rule
     STD_syntax_highlight foo.pl statementlist
 
@@ -73 +76 @@
     );
 
-    if ($#ARGV < 0 || $help) {
+    if ($help) {
         die <<"HELP";
 USAGE: 
-    $PROGRAM_NAME [options] filename [rule]
-
-    where options can be one of the following:
+    $PROGRAM_NAME [options] [file] [rule]
+
+    where 'file' is optional; if omitted or is '-' then 
+    STDIN will be used. And 'options' can be one of the following:
 
     --clean-html    
@@ -87 +91 @@
 
     --simple-html=filename   
-        write simple-mode html to filename (defaults to STDOUT if no other 
-        option is selected, - for STDOUT)
+        write simple-mode html to filename (- for STDOUT)
 
     --snippet-html=filename
-        same as --simple-html but with only the body section. 
-        This is typically ideal for inline html code.
+        This is typically ideal for inline html code. (- for STDOUT)
 
     --ansi-text=filename   
@@ -103 +105 @@
 
     #default is --simple-html=- if no option is selected
-    if(!($ansi_text || $full_html || $snippet_html || $yaml) && !$simple_html) {
-        $simple_html = '-';    
+    if(!($simple_html || $full_html || $snippet_html || $yaml) && !$ansi_text) {
+        $ansi_text = '-';    
     }
 
@@ -111 +113 @@
     my $what = shift @ARGV // 'comp_unit';
 
-    unless(-r $file) {
-        die "Could not open '$file' for reading\n";
-    }
-
-    # slurp the file for redspans
+    #what is the meaning of your input file?
+    if(!$file || $file eq '-') {
+        # i think you mean standard input
+        $file = \*STDIN;        
+    } else {
+        # no it is should be a file, let me check
+        unless(-r $file) {
+            die "Could not open '$file' for reading\n";
+        }
+    }
+
+    # slurp the file for parsing and redspans
     $src_text = Encode::decode('utf8', read_file($file) );
-
     $loc[length($src_text) - 1] = [];
-
-    $parser = STD->parsefile($file,$what);
+    $parser = STD->parse($src_text,$what);
 
     # and finally print out the html code