Merge pull request #831 from jackos/jackos/add-mojo

Add support for Mojo, #831
AlDanial · May 26, 2024 · 61d4fc9 · 61d4fc9
2 parents 333d6bf + ae61d65
commit 61d4fc9
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -1199,7 +1199,8 @@ Maven                      (pom, pom.xml)
 Meson                      (meson.build)
 Metal                      (metal)
 Modula3                    (i3, ig, m3, mg)
-Mojo                       (mojom)
+Mojom                      (mojom)
+Mojo                       (mojo, 🔥)
 MSBuild script             (btproj, csproj, msbuild, vcproj, wdproj, wixproj)
 MUMPS                      (mps, m)
 Mustache                   (mustache)

diff --git a/Unix/AUTHORS b/Unix/AUTHORS
@@ -29,4 +29,5 @@ https://github.com/mwiley
 https://github.com/michalmuskala
 https://github.com/Inventitech
 https://github.com/zhangzqs
-https://github.com/drkameleon
+https://github.com/drkameleon
+https://github.com/jackos
diff --git a/Unix/cloc b/Unix/cloc
@@ -8625,7 +8625,9 @@ sub set_constants {                          # {{{1
             'mc'          => 'Windows Message File'  ,
             'met'         => 'Teamcenter met'        ,
             'mg'          => 'Modula3'               ,
-            'mojom'       => 'Mojo'                  ,
+            'mojom'       => 'Mojom'                 ,
+            'mojo'        => 'Mojo'                  ,
+            '🔥'          => 'Mojo'                  ,
             'meson.build' => 'Meson'                 ,
             'metal'       => 'Metal'                 ,
             'mk'          => 'make'                  ,
@@ -10076,7 +10078,15 @@ sub set_constants {                          # {{{1
     'Modula3'            => [   [ 'call_regexp_common'  , 'Pascal' ], ],
         # Modula 3 comments are (* ... *) so applying the Pascal filter
         # which also treats { ... } as a comment is not really correct.
-    'Mojo'               => [   [ 'call_regexp_common' , 'C++' ], ],
+    'Mojom'              => [   [ 'call_regexp_common' , 'C++' ], ],
+    'Mojo'               => [
+                                [ 'remove_matches'      , '/\*'    ],
+                                [ 'remove_matches'      , '\*/'    ],
+                                [ 'remove_matches'      , '^\s*#'  ],
+                                [ 'docstring_to_C'                 ],
+                                [ 'call_regexp_common'  , 'C'      ],
+                                [ 'remove_inline'       , '#.*$'   ],
+                            ],
     'Nemerle'            => [
                                 [ 'rm_comments_in_strings', '"', '/*', '*/' ],
                                 [ 'rm_comments_in_strings', '"', '//', '' ],
@@ -11457,7 +11467,8 @@ sub set_constants {                          # {{{1
     'Octave'                       => 4.00,
     'ML'                           => 3.00,
     'Modula3'                      => 2.00,
-    'Mojo'                         => 2.00,
+    'Mojom'                        => 2.00,
+    'Mojo'                         => 4.20,
     'PHP'                          => 3.50,
     'Jupyter Notebook'             => 4.20,
     'Python'                       => 4.20,

diff --git a/Unix/t/00_C.t b/Unix/t/00_C.t
@@ -742,10 +742,15 @@ my @Tests = (
                     'args' => '../tests/inputs/SimpleODE.mo',
                 },
                 {
-                    'name' => 'Mojo',
+                    'name' => 'Mojom',
                     'ref'  => '../tests/outputs/Mojo.mojom.yaml',
                     'args' => '../tests/inputs/Mojo.mojom',
                 },
+                {
+                    'name' => 'Mojo',
+                    'ref'  => '../tests/outputs/hi.mojo.yaml',
+                    'args' => '../tests/inputs/hi.mojo',
+                },
                 {
                     'name' => 'Mumps',
                     'ref'  => '../tests/outputs/Mumps.mps.yaml',

diff --git a/cloc b/cloc
@@ -8640,7 +8640,9 @@ sub set_constants {                          # {{{1
             'mc'          => 'Windows Message File'  ,
             'met'         => 'Teamcenter met'        ,
             'mg'          => 'Modula3'               ,
-            'mojom'       => 'Mojo'                  ,
+            'mojom'       => 'Mojom'                 ,
+            'mojo'        => 'Mojo'                  ,
+            '🔥'          => 'Mojo'                 ,
             'meson.build' => 'Meson'                 ,
             'metal'       => 'Metal'                 ,
             'mk'          => 'make'                  ,
@@ -10091,7 +10093,16 @@ sub set_constants {                          # {{{1
     'Modula3'            => [   [ 'call_regexp_common'  , 'Pascal' ], ],
         # Modula 3 comments are (* ... *) so applying the Pascal filter
         # which also treats { ... } as a comment is not really correct.
-    'Mojo'               => [   [ 'call_regexp_common' , 'C++' ], ],
+    'Mojom'               => [   [ 'call_regexp_common' , 'C++' ], ],
+    'Mojo'              => [
+                                [ 'remove_matches'      , '/\*'    ],
+                                [ 'remove_matches'      , '\*/'    ],
+                                [ 'remove_matches'      , '^\s*#'  ],
+                                [ 'docstring_to_C'                 ],
+                                [ 'call_regexp_common'  , 'C'      ],
+                                [ 'remove_inline'       , '#.*$'   ],
+                            ],
+
     'Nemerle'            => [
                                 [ 'rm_comments_in_strings', '"', '/*', '*/' ],
                                 [ 'rm_comments_in_strings', '"', '//', '' ],
@@ -11472,7 +11483,8 @@ sub set_constants {                          # {{{1
     'Octave'                       => 4.00,
     'ML'                           => 3.00,
     'Modula3'                      => 2.00,
-    'Mojo'                         => 2.00,
+    'Mojom'                        => 2.00,
+    'Mojo'                         => 4.20,
     'PHP'                          => 3.50,
     'Jupyter Notebook'             => 4.20,
     'Python'                       => 4.20,

diff --git a/tests/inputs/hi.mojo b/tests/inputs/hi.mojo
@@ -0,0 +1,18 @@
+#mojo
+# Works with Mojo.
+
+# pound comment
+
+def main():
+    from time import now
+    print("Hello, the monotonic time is:", now())  # inline comment
+
+"""
+Docstring,
+  also counted as comment.
+"""
+
+'''
+Single
+  Quoted
+    Docstring'''
diff --git a/tests/outputs/hi.mojo.yaml b/tests/outputs/hi.mojo.yaml
@@ -0,0 +1,21 @@
+---
+# github.com/AlDanial/cloc
+header : 
+  cloc_url           : github.com/AlDanial/cloc
+  cloc_version       : 2.01
+  elapsed_seconds    : 0.0048980712890625
+  n_files            : 1
+  n_lines            : 12
+  files_per_second   : 204.16199376947
+  lines_per_second   : 2449.94392523364
+  report_file        : hi.mojo.yaml
+Mojo :
+  nFiles: 1
+  blank: 4
+  comment: 11
+  code: 3
+SUM: 
+  blank: 4
+  comment: 11
+  code: 2
+  nFiles: 1