remove mod keyword

koka-lang · Dec 30, 2023 · c7fb71d · c7fb71d
1 parent c734294
commit c7fb71d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/doc/spec/grammar/lexer.l b/doc/spec/grammar/lexer.l
@@ -169,7 +169,6 @@ match                     { return MATCH;}
 return                    { return RETURN;}
 
 module                    { return MODULE;}
-mod                       { return MOD;}
 import                    { return IMPORT;}
 pub                       { return PUB;}
 as                        { return AS;}

diff --git a/doc/spec/grammar/parser.y b/doc/spec/grammar/parser.y
@@ -115,14 +115,10 @@ void printDecl( const char* sort, const char* name );
 -- Program
 ----------------------------------------------------------*/
 
-program     : semis modkeyword modulepath moduledecl  { printDecl("module",$3); }
+program     : semis MODULE modulepath moduledecl  { printDecl("module",$3); }
             | moduledecl                          { printDecl("module","main"); }
             ;
 
-modkeyword  : MODULE
-            | MOD
-            ;
-
 moduledecl  : '{' semis modulebody '}' semis
             | semis modulebody
             ;

diff --git a/doc/spec/spec.kk.md b/doc/spec/spec.kk.md
@@ -99,7 +99,7 @@ grammar will draw it's lexemes from the _lex_ production.
 | _idfinal_    | ::=   | [``'``]{.many}                                                                                |                         |
 | &nbsp;       |       |                                                                                               |                         |
 | _reserved_   | ::=   | `infix` &bar; `infixr` &bar; `infixl`                                                   |                         |
-|              | &bar; | ``module`` &bar; `mod` &bar; `import` &bar; `as`                                                    |                         |
+|              | &bar; | ``module`` &bar; `import` &bar; `as`                                                    |                         |
 |              | &bar; | ``pub`` &bar; `abstract`                                                                   |                         |
 |              | &bar; | `type` &bar; `struct` &bar; `alias` &bar; `effect` &bar; `con`                    |                         |
 |              | &bar; | `forall` &bar; `exists` &bar; `some`                                                    |                         |
@@ -485,7 +485,7 @@ ignored.
 |~~~~~~~~~~~~~~~~~~~~~~~~~|~~~~~~~|~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~|~~~|
 | _module_~[_lex_]{.opt}~ | ::=   | [_moduledecl_]{.opt} _modulebody_                 |   |
 | &nbsp;                  |       |                                                   |   |
-| _moduledecl_            | ::=   | _semis_  (`module` &bar; `mod`)  _moduleid_                      |   |
+| _moduledecl_            | ::=   | _semis_  `module` _moduleid_                      |   |
 | _moduleid_              | ::=   | _qvarid_ &bar; _varid_                         |   |
 | &nbsp;                  |       |                                                   |   |
 | _modulebody_            | ::=   | `{` _semis_ _declarations_ `}` _semis_            |   |

diff --git a/support/pygments/koka.py b/support/pygments/koka.py
@@ -25,7 +25,7 @@ class KokaLexer(RegexLexer):
 
     keywords = [
         'infix', 'infixr', 'infixl',
-        'module', 'import', 'as', 'mod'
+        'module', 'import', 'as',
         'pub', 'abstract', 'ctx'
         'type', 'struct', 'alias', 'effect', 'con',
         'forall', 'exists', 'some',
@@ -87,7 +87,7 @@ class KokaLexer(RegexLexer):
 
             # special sequences of tokens (we use ?: for non-capturing group as
             # required by 'bygroups')
-            (r'(module|mod)(\s+)(interface\s+)?((?:[a-z]\w*/)*[a-z]\w*)',
+            (r'(module)(\s+)(interface\s+)?((?:[a-z]\w*/)*[a-z]\w*)',
              bygroups(Keyword, Text, Keyword, Name.Namespace)),
             (r'(import)(\s+)((?:[a-z]\w*/)*[a-z]\w*)'
               r'(?:(\s*)(=)(\s*)((?:qualified\s*)?)'