Improve file names and directory structure.

Follow the dune spirit, i.e. stop prefixing modules with `Gitconfig_`.

cli/dune

@@ -5,18 +5,6 @@
  (modules main api config issue merge_request project user)
  (name main))
 
-; Parser for Git config files
-(library
-  (name gitconfig)
-  (package lab)
-  (modules gitconfig_lexer gitconfig_types gitconfig_parser)
-  (modules_without_implementation gitconfig_types))
-
-(ocamllex gitconfig_lexer)
-
-(menhir
- (modules gitconfig_parser))
-
 (mdx
  (files lab.md)
  (package lab)

cli/gitconfig/dune

@@ -0,0 +1,10 @@
+(library
+  (name gitconfig)
+  (package lab)
+  (modules types lexer parser)
+  (modules_without_implementation types))
+
+(ocamllex lexer)
+
+(menhir
+ (modules parser))

cli/gitconfig_lexer.mll → cli/gitconfig/lexer.mll

@@ -1,5 +1,5 @@
 {
-open Gitconfig_parser
+open Parser
 
 exception Error of string
 }

cli/gitconfig_parser.mly → cli/gitconfig/parser.mly

@@ -1,14 +1,14 @@
 %{
 %}
 
-%token <Gitconfig_types.binding> KEYVAL
+%token <Types.binding> KEYVAL
 %token <string> SECTIONHEADER
 %token EOF
 
 %start config
 
-%type <Gitconfig_types.config> config
-%type <Gitconfig_types.binding> key_value
+%type <Types.config> config
+%type <Types.binding> key_value
 
 %%
 config:

test/gitconfig/gitconfig.ml

@@ -1,5 +1,3 @@
-open Gitconfig
-
 let print_config fmt config =
   let open Format in
   let rec print_bindings fmt = function
@@ -31,10 +29,10 @@ let () =
 |}
   in
   try
-    let config = Gitconfig_parser.config Gitconfig_lexer.token lexbuf in
+    let config = Gitconfig.Parser.config Gitconfig.Lexer.token lexbuf in
     print_config Format.std_formatter config
   with
-  | Gitconfig_lexer.Error msg ->
+  | Gitconfig.Lexer.Error msg ->
       Printf.fprintf stderr "%s%!" msg
-  | Gitconfig_parser.Error ->
+  | Gitconfig.Parser.Error ->
       Printf.fprintf stderr "At offset %d: syntax error.\n%!" (Lexing.lexeme_start lexbuf)