Changeset ac2c8dbc9cf9d22089842649c5bd77572a510071

Timestamp:

02/27/2008 01:48:12 PM (10 months ago)

Author:

Robin Luckey <robin@Tangier.local>

git-committer:

Robin Luckey <robin@Tangier.local> 1204148892 -0800

git-parent:

[2a533e62d2b0ab7038dee51d5a642a45efe0de79], [814bbd214306afc451cac2e2aea7189ae8fea0c3]

git-author:

Robin Luckey <robin@Tangier.local> 1204148892 -0800

Message:

Merge branch 'smalltalk'

Conflicts:

ext/ohcount_native/glots/c_monoglot.rb

Files:

• ext/ohcount_native/generator.rb (modified) (2 diffs)
• lib/ohcount/detector.rb (modified) (1 diff)
• lib/ohcount/sloc_info.rb (modified) (1 diff)
• test/expected_dir/smalltalk1.st/smalltalk/blanks (added)
• test/expected_dir/smalltalk1.st/smalltalk/code (added)
• test/expected_dir/smalltalk1.st/smalltalk/comment (added)
• test/src_dir/smalltalk1.st (added)
• test/unit/detector_test.rb (modified) (1 diff)
• test/unit/smalltalk_test.rb (added)

ext/ohcount_native/generator.rb

@@ -50 +50 @@
-      scheme = LineCommentMonoglot.new("scheme", ";")
-      shell = CMonoglot.new("shell",             '#',              nil,                false, false)
+      smalltalk = CMonoglot.new("smalltalk",            nil,             [e('"'), e('"')], false,  true, options = {:no_escape_squote => true})
-      sql = CMonoglot.new("sql",                 ['--','//'],      [['{','}'], [e('/*'), e('*/')]], true, true)
-      tcl = CMonoglot.new("tcl",                 '#',              nil,                true,  false)
@@ -96 +97 @@
-        scheme ,
-        shell ,
+        smalltalk ,
-        sql ,
-        tcl ,

lib/ohcount/detector.rb

@@ -168 +168 @@
-    '.sh'   => "shell",
-    '.sql'  => "sql",
+    '.st'   => "smalltalk",
-    '.tcl'  => "tcl",
-    '.tpl'  => "html",

lib/ohcount/sloc_info.rb

@@ -70 +70 @@
-      'scheme'        => {:nice_name => 'Scheme'           , :category => 0},
-      'shell'         => {:nice_name => 'shell script'     , :category => 0},
+      'smalltalk'     => {:nice_name => 'Smalltalk'        , :category => 0},
-      'sql'           => {:nice_name => 'SQL'              , :category => 0},
-      'tcl'           => {:nice_name => 'Tcl'              , :category => 0},

test/unit/detector_test.rb

@@ -44 +44 @@
-    assert_equal "objective_c", do_detect("foo_objective_c.h", ["foo_objective_c.h, different_than_foo.m"])
-    assert_equal "php", do_detect("upper_case_php")
+    assert_equal "smalltalk", do_detect("example.st")
-    assert_equal "vala", do_detect("foo.vala")
-    assert_equal "tex", do_detect("foo.tex")