opa: program_with_tokens -> program_and_tokens

facebookarchive · Aug 5, 2015 · 45fdb98 · 45fdb98
1 parent 375d907
commit 45fdb98
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lang_opa/analyze/highlight_opa.mli b/lang_opa/analyze/highlight_opa.mli
@@ -2,5 +2,5 @@
 val visit_toplevel :
   tag_hook:(Ast_opa.tok -> Highlight_code.category -> unit) ->
   Highlight_code.highlighter_preferences ->
-  Parse_opa.program_with_tokens ->
+  Parse_opa.program_and_tokens ->
   unit
diff --git a/lang_opa/parsing/parse_opa.ml b/lang_opa/parsing/parse_opa.ml
@@ -33,7 +33,7 @@ module PI = Parse_info
 (*****************************************************************************)
 
 (* the token list contains also the comment-tokens *)
-type program_with_tokens = 
+type program_and_tokens = 
   Ast_opa.program * Parser_opa.token list
 
 (*****************************************************************************)

diff --git a/lang_opa/parsing/parse_opa.mli b/lang_opa/parsing/parse_opa.mli
@@ -1,13 +1,13 @@
 
-type program_with_tokens = Ast_opa.program * Parser_opa.token list
+type program_and_tokens = Ast_opa.program * Parser_opa.token list
 
 exception Parse_error of Parse_info.info
 
 (* This is the main function *)
-val parse: Common.filename -> program_with_tokens
+val parse: Common.filename -> program_and_tokens
 
 (* degenerated parser *)
-val parse_just_tokens: Common.filename -> program_with_tokens
+val parse_just_tokens: Common.filename -> program_and_tokens
 
 (* internal *)
 val tokens: Common.filename -> Parser_opa.token list