Changeset f879617036bdd5fd3a3b025152f58886e88b559a

Show
Ignore:
Timestamp:
01/16/2008 08:44:50 AM (1 year ago)
Author:
Robin Luckey <robin@Tangier.ohloh.net>
git-committer:
Robin Luckey <robin@Tangier.ohloh.net> 1200501890 -0800
git-parent:

[477114b6628541f558edc09014b2d550ada291b7]

git-author:
Jürg Billeter <j@bitron.ch> 1200492524 +0100
Message:

Add support for Vala source code

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • ext/ohcount_native/generator.rb

    r101d05d rf879617  
    4949      sql = CMonoglot.new("sql",                 ['--','//'],      [['{','}'], [e('/*'), e('*/')]], true, true) 
    5050      tcl = CMonoglot.new("tcl",                 '#',              nil,                true,  false) 
     51      vala = CMonoglot.new("vala",               '//',             [e('/*'), e('*/')], true,  false) 
    5152      visualbasic = CMonoglot.new("visualbasic", '\'',             nil,                true,  false) 
    5253      xml = XmlMonoglot.new("xml") 
    …… 
    8990        sql , 
    9091        tcl , 
     92        vala , 
    9193        visualbasic , 
    9294        xml , 

  • ext/ohcount_native/polyglots.c

    rb4f9575 rf879617  
    775775      TCL_STATES, 
    776776      TCL_TRANSITIONS, 
     777  NULL 
     778}; 
     779 
     780/***************************************************************************** 
     781                                      vala 
     782*****************************************************************************/ 
     783/* States */ 
     784State VALA_CODE = { "VALA_CODE", "vala", semantic_code }; 
     785State VALA_DQUOTE_STRING = { "VALA_DQUOTE_STRING", "vala", semantic_code }; 
     786State VALA_SQUOTE_STRING = { "VALA_SQUOTE_STRING", "vala", semantic_code }; 
     787State VALA_LINE_COMMENT = { "VALA_LINE_COMMENT", "vala", semantic_comment }; 
     788State VALA_BLOCK_COMMENT = { "VALA_BLOCK_COMMENT", "vala", semantic_comment }; 
     789State *VALA_STATES[] = { &VALA_CODE, &VALA_DQUOTE_STRING, &VALA_SQUOTE_STRING, &VALA_LINE_COMMENT, &VALA_BLOCK_COMMENT, NULL }; 
     790/* Transitions */ 
     791Transition VALA_CODE__LINE_COMMENT_0 = { "//", &VALA_CODE, &VALA_LINE_COMMENT, ToEatsToken, false }; 
     792Transition VALA_LINE_COMMENT__RETURN = { "\n", &VALA_LINE_COMMENT, RETURN, FromEatsToken, false }; 
     793Transition VALA_CODE__BLOCK_COMMENT_0 = { "/\\*", &VALA_CODE, &VALA_BLOCK_COMMENT, ToEatsToken, false }; 
     794Transition VALA_BLOCK_COMMENT__RETURN_0 = { "\\*/", &VALA_BLOCK_COMMENT, RETURN, FromEatsToken, false }; 
     795Transition VALA_CODE__DQUOTE_STRING = { "\"", &VALA_CODE, &VALA_DQUOTE_STRING, ToEatsToken, false }; 
     796Transition VALA_DQUOTE_STRING__DQUOTE_STRING_ESC_SLASH = { "\\\\\\\\", &VALA_DQUOTE_STRING, &VALA_DQUOTE_STRING, ToEatsToken, true }; 
     797Transition VALA_DQUOTE_STRING__DQUOTE_STRING_ESC = { "\\\\\"", &VALA_DQUOTE_STRING, &VALA_DQUOTE_STRING, ToEatsToken, true }; 
     798Transition VALA_DQUOTE_STRING__RETURN = { "\"", &VALA_DQUOTE_STRING, RETURN, FromEatsToken, false }; 
     799Transition *VALA_TRANSITIONS[] = { &VALA_CODE__LINE_COMMENT_0, &VALA_LINE_COMMENT__RETURN, &VALA_CODE__BLOCK_COMMENT_0, &VALA_BLOCK_COMMENT__RETURN_0, &VALA_CODE__DQUOTE_STRING, &VALA_DQUOTE_STRING__DQUOTE_STRING_ESC_SLASH, &VALA_DQUOTE_STRING__DQUOTE_STRING_ESC, &VALA_DQUOTE_STRING__RETURN, NULL}; 
     800Polyglot VALA_POLYGLOT = { 
     801  "vala", 
     802      VALA_STATES, 
     803      VALA_TRANSITIONS, 
    777804  NULL 
    778805}; 
    …… 
    10121039  &SQL_POLYGLOT, 
    10131040  &TCL_POLYGLOT, 
     1041  &VALA_POLYGLOT, 
    10141042  &VISUALBASIC_POLYGLOT, 
    10151043  &XML_POLYGLOT, 

  • lib/ohcount/detector.rb

    r101d05d rf879617  
    155155    '.tcl'  => "tcl", 
    156156    '.tpl'  => "html", 
     157    '.vala' => "vala", 
    157158    '.vb'   => "visualbasic", 
    158159    '.vba'  => "visualbasic", 

  • lib/ohcount/sloc_info.rb

    rb4f9575 rf879617  
    6565      'sql'           => {:nice_name => 'SQL'              , :category => 0}, 
    6666      'tcl'           => {:nice_name => 'Tcl'              , :category => 0}, 
     67      'vala'          => {:nice_name => 'Vala'             , :category => 0}, 
    6768      'visualbasic'   => {:nice_name => 'Visual Basic'     , :category => 0}, 
    6869      'xml'           => {:nice_name => 'XML'              , :category => 1}, 

  • test/unit/detector_test.rb

    r101d05d rf879617  
    3939    assert_equal "objective_c", do_detect("foo_objective_c.h", ["foo_objective_c.h, different_than_foo.m"]) 
    4040    assert_equal "php", do_detect("upper_case_php") 
     41    assert_equal "vala", do_detect("foo.vala") 
    4142    assert_equal "lisp", do_detect("core.lisp") 
    4243    assert_equal "dmd", do_detect("foo.d")