Changeset 92ced6805523ab68e24040f05770286014a06acb

Show
Ignore:
Timestamp:
06/02/2008 01:10:04 PM (7 months ago)
Author:
mitchell <mitchell@frost.(none)>
git-committer:
mitchell <mitchell@frost.(none)> 1212437404 -0400
git-parent:

[1585a88c144155c0ec306458bfcb001c9c6923ab]

git-author:
mitchell <mitchell@frost.(none)> 1212437404 -0400
Message:

Reverted conditional in 'code' action and fixed VIM parser appropriately.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • ext/ohcount_native/ragel_parser_macros.h

    r1585a88 r92ced68  
    1313#define code {\ 
    1414  if (!line_contains_code && !line_start) line_start = ts; \ 
    15   if (!whole_line_comment) line_contains_code = 1; \ 
     15  line_contains_code = 1; \ 
    1616} 
    1717 

  • ext/ohcount_native/ragel_parsers/common.rl

    r173cc42 r92ced68  
    2626action code { 
    2727  if (!line_contains_code && !line_start) line_start = ts; 
    28   if (!whole_line_comment) line_contains_code = 1; 
     28  line_contains_code = 1; 
    2929} 
    3030 

  • ext/ohcount_native/ragel_parsers/vim.rl

    r8941b20 r92ced68  
    4848 
    4949  vim_sq_str = '\'' @code ([^\r\n\f'\\] | '\\' any)* '\''; 
    50   vim_dq_str = '"' @code ([^\r\n\f"\\] | '\\' any)* '"'; 
     50  vim_dq_str = '"' when !no_code @code ([^\r\n\f"\\] | '\\' any)* '"'; 
    5151  vim_string = vim_sq_str | vim_dq_str; 
    5252 
    …… 
    5656    vim_string; 
    5757    newline        ${ entity = NEWLINE;   } => vim_ccallback; 
    58     '"'; 
     58    #'"'; 
    5959    ^(space | '"') ${ entity = VIM_ANY;   } => vim_ccallback; 
    6060