diff options
| author | Andi Gutmans <andi@php.net> | 2001-05-02 21:48:07 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2001-05-02 21:48:07 +0000 |
| commit | 62bec3a7a791179537b3e5c9a3302996c24b560c (patch) | |
| tree | 85727a695ad1399c7858261c40ed570ada37d908 /Zend/zend_language_scanner.l | |
| parent | ed267a7d6613c72e43fd4d127791d267d2966f4a (diff) | |
| download | php-git-62bec3a7a791179537b3e5c9a3302996c24b560c.tar.gz | |
- Handle MAC OS X \r line endings
Diffstat (limited to 'Zend/zend_language_scanner.l')
| -rw-r--r-- | Zend/zend_language_scanner.l | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index bdd1a9a8ce..5e5ecb0d4f 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -603,6 +603,7 @@ TOKENS [;:,.\[\]()|^&+-/*=%!~$<>?@] ENCAPSED_TOKENS [\[\]{}$] ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+ ANY_CHAR (.|[\n]) +NEWLINE ("\r"|"\n"|"\r\n") %option noyylineno %option noyywrap @@ -1122,7 +1123,7 @@ ANY_CHAR (.|[\n]) } -<INITIAL>"<?php_track_vars?>"("\n"|"\r\n")? { +<INITIAL>"<?php_track_vars?>"{NEWLINE}? { zend_error(E_WARNING, "<?php_track_vars?> is no longer supported - please use the track_vars INI directive instead"); HANDLE_NEWLINE(yytext[yyleng-1]); zendlval->value.str.val = (char *) estrndup(yytext, yyleng); @@ -1177,7 +1178,7 @@ ANY_CHAR (.|[\n]) yymore(); } -<ST_ONE_LINE_COMMENT>"\n"|"\r\n" { +<ST_ONE_LINE_COMMENT>{NEWLINE} { zendlval->value.str.val = yytext; /* no copying - intentional */ zendlval->value.str.len = yyleng; zendlval->type = IS_STRING; @@ -1220,7 +1221,7 @@ ANY_CHAR (.|[\n]) yymore(); } -<ST_IN_SCRIPTING>("?>"|"</script"{WHITESPACE}*">")("\n"|"\r\n")? { +<ST_IN_SCRIPTING>("?>"|"</script"{WHITESPACE}*">"){NEWLINE}? { zendlval->value.str.val = yytext; /* no copying - intentional */ zendlval->value.str.len = yyleng; zendlval->type = IS_STRING; @@ -1230,7 +1231,7 @@ ANY_CHAR (.|[\n]) } -<ST_IN_SCRIPTING>"%>"("\n"|"\r\n")? { +<ST_IN_SCRIPTING>"%>"{NEWLINE}? { if (CG(asp_tags)) { BEGIN(INITIAL); zendlval->value.str.len = yyleng; @@ -1373,7 +1374,7 @@ ANY_CHAR (.|[\n]) } -<ST_IN_SCRIPTING>"<<<"{TABS_AND_SPACES}{LABEL}("\r")?"\n" { +<ST_IN_SCRIPTING>"<<<"{TABS_AND_SPACES}{LABEL}{NEWLINE} { char *s; CG(zend_lineno)++; CG(heredoc_len) = yyleng-3-1-(yytext[yyleng-2]=='\r'?1:0); @@ -1400,7 +1401,7 @@ ANY_CHAR (.|[\n]) } -<ST_HEREDOC>^{LABEL}(";")?("\r")?"\n" { +<ST_HEREDOC>^{LABEL}(";")?{NEWLINE} { int label_len; unsigned char unput_semicolon; |