Skip to content

Commit

Permalink
allow * in identifiers (#815)
Browse files Browse the repository at this point in the history
  • Loading branch information
fblanqui authored Jan 15, 2022
1 parent 089f239 commit efd9e64
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Logic/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PKG := TFF U Zenon PTS

.PHONY: default
default:
default: clean
for p in $(PKG); do $(MAKE) -C $$p; done

%:
Expand Down
4 changes: 2 additions & 2 deletions src/parsing/lpLexer.ml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ let string = [%sedlex.regexp? '"', Star (Compl '"'), '"']

(** Unqualified regular identifiers are any non-empty sequence of characters
not among: *)
let forbidden_letter = [%sedlex.regexp? Chars " ,;\r\t\n(){}[]:.`\"@$|?/*"]
let forbidden_letter = [%sedlex.regexp? Chars " ,;\r\t\n(){}[]:.`\"@$|/"]
let regid = [%sedlex.regexp? '/' | '*' | Plus (Compl forbidden_letter)]

let is_regid : string -> bool = fun s ->
Expand Down Expand Up @@ -280,7 +280,7 @@ let rec token lb =
| '_' -> UNDERSCORE

(* identifiers *)
| regid -> UID(Utf8.lexeme lb)
| '/' | regid -> UID(Utf8.lexeme lb)
| escid -> UID(remove_useless_escape(Utf8.lexeme lb))
| '@', regid -> UID_EXPL(remove_first lb)
| '@', escid -> UID_EXPL(remove_useless_escape(remove_first lb))
Expand Down
3 changes: 3 additions & 0 deletions tests/OK/identifiers.lp
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
symbol /:TYPE;
symbol *:TYPE;
symbol **:TYPE;

0 comments on commit efd9e64

Please sign in to comment.