From eadb00648127c9a535b533d51189dce41ef16db7 Mon Sep 17 00:00:00 2001
From: Pierre Roux
Date: Sun, 17 Feb 2019 10:10:22 +0100
Subject: Multiple payload types in tokens

Instead of just string (and empty strings for tokens without payload)
---
 gramlib/plexing.ml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'gramlib/plexing.ml')

diff --git a/gramlib/plexing.ml b/gramlib/plexing.ml
index 6da06f147f..e881ab3350 100644
--- a/gramlib/plexing.ml
+++ b/gramlib/plexing.ml
@@ -2,15 +2,17 @@
 (* plexing.ml,v *)
 (* Copyright (c) INRIA 2007-2017 *)
 
-type pattern = string * string option
-
 type location_function = int -> Loc.t
 type 'te lexer_func = ?loc:Loc.t -> char Stream.t -> 'te Stream.t * location_function
 
-type 'te lexer =
-  { tok_func : 'te lexer_func;
-    tok_using : pattern -> unit;
-    tok_removing : pattern -> unit;
-    tok_match : pattern -> 'te -> string;
-    tok_text : pattern -> string;
-  }
+module type Lexer = sig
+  type te
+  type 'c pattern
+  val tok_pattern_eq : 'a pattern -> 'b pattern -> ('a, 'b) Util.eq option
+  val tok_pattern_strings : 'c pattern -> string * string option
+  val tok_func : te lexer_func
+  val tok_using : 'c pattern -> unit
+  val tok_removing : 'c pattern -> unit
+  val tok_match : 'c pattern -> te -> 'c
+  val tok_text : 'c pattern -> string
+end
-- 
cgit v1.2.3