From ada42c36da4c78d96f05ef9f4ffac162b200c533 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 25 Nov 2005 15:59:43 +0000
Subject: - make <<"EOF" a warning, not an error (and adapt test for it) - fix
 warning "Trailing spaces after HERE-document mark" (was on stderr)

---
 perl_checker.src/lexer.mll                  | 15 +++++++++------
 perl_checker.src/test/syntax_restrictions.t |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/perl_checker.src/lexer.mll b/perl_checker.src/lexer.mll
index 7de0f13..389a179 100644
--- a/perl_checker.src/lexer.mll
+++ b/perl_checker.src/lexer.mll
@@ -677,16 +677,19 @@ rule token = parse
     not_ok_for_match := lexeme_end lexbuf; 
     HERE_DOC(here_doc_next_line (skip_n_char 2 (lexeme lexbuf)), pos lexbuf)
   }
+| "<<\"" ident "\"" { 
+    warn_with_pos [Warn_suggest_simpler] (lexeme_start lexbuf + 2, lexeme_end lexbuf) "Don't use <<\"MARK\", use <<MARK instead" ;
+    not_ok_for_match := lexeme_end lexbuf; 
+    HERE_DOC(here_doc_next_line (skip_n_char_ 3 1 (lexeme lexbuf)), pos lexbuf)
+  }
 | "<<'" ident "'" { 
     not_ok_for_match := lexeme_end lexbuf; 
     RAW_HERE_DOC(raw_here_doc_next_line (skip_n_char_ 3 1 (lexeme lexbuf)), pos lexbuf)
   }
 | "<<" ' '+ "'"
-| "<<" ' '+ ident { 
-    failwith (pos2sfull_with (lexeme_start lexbuf + 2) (lexeme_end lexbuf) ^ "No space allowed between \"<<\" and the marker")
-  }
+| "<<" ' '+ ident
 | "<<" ' '* '"' { 
-    failwith (pos2sfull_with (lexeme_start lexbuf + 2) (lexeme_end lexbuf) ^ "Don't use <<\"MARK\", use <<MARK instead")
+    failwith (pos2sfull_with (lexeme_start lexbuf + 2) (lexeme_end lexbuf) ^ "No space allowed between \"<<\" and the marker")
   }
 
 | "\\"+ stash
@@ -880,7 +883,7 @@ and here_doc = parse
     let s = lexeme lexbuf in
     if chomps s <> !current_here_doc_mark
     then next_s s here_doc lexbuf 
-    else if s <> !current_here_doc_mark then Printf.eprintf "%sTrailing spaces after HERE-document mark\n" (pos2sfull lexbuf)
+    else if s <> !current_here_doc_mark then warn_with_pos [Warn_traps] (pos lexbuf) "Trailing spaces after HERE-document mark"
   }
 | '\n' { 
     add_a_new_line(lexeme_end lexbuf);
@@ -893,7 +896,7 @@ and raw_here_doc = parse
     let s = lexeme lexbuf in
     if chomps s <> !current_here_doc_mark
     then next_s s raw_here_doc lexbuf 
-    else if s <> !current_here_doc_mark then Printf.eprintf "%sTrailing spaces after HERE-document mark\n" (pos2sfull lexbuf)
+    else if s <> !current_here_doc_mark then warn_with_pos [Warn_traps] (pos lexbuf) "Trailing spaces after HERE-document mark"
   }
 | '\n' { 
     add_a_new_line(lexeme_end lexbuf);
diff --git a/perl_checker.src/test/syntax_restrictions.t b/perl_checker.src/test/syntax_restrictions.t
index eb186d8..de7bf77 100644
--- a/perl_checker.src/test/syntax_restrictions.t
+++ b/perl_checker.src/test/syntax_restrictions.t
@@ -65,6 +65,6 @@ sub f2 { my ($x, $_y) = @_; $x }         not enough parameters
 f2(@l);    # ok                          
 f2(xxx()); # bad                         
 
-<<"EOF"                                  Don't use <<"MARK", use <<MARK instead
+$xxx = <<"EOF";                          Don't use <<"MARK", use <<MARK instead
 foo                                      
 EOF                                      
-- 
cgit v1.2.1