From e3a03806e4b6966693424fe2db6f7343a7657a46 Mon Sep 17 00:00:00 2001 From: Adrien Guatto Date: Mon, 2 Aug 2010 16:13:58 +0200 Subject: [PATCH] Added missing boolean operator: XOR. --- compiler/heptagon/parsing/hept_lexer.mll | 2 +- lib/pervasives.epi | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/heptagon/parsing/hept_lexer.mll b/compiler/heptagon/parsing/hept_lexer.mll index 2e842ec..d5bd561 100644 --- a/compiler/heptagon/parsing/hept_lexer.mll +++ b/compiler/heptagon/parsing/hept_lexer.mll @@ -65,7 +65,7 @@ List.iter (fun (str,tok) -> Hashtbl.add keyword_table str tok) [ "mod", INFIX3("mod"); "land", INFIX3("land"); "lor", INFIX2("lor"); - "lxor", INFIX2("lxor"); + "xor", INFIX2("xor"); "lsl", INFIX4("lsl"); "lsr", INFIX4("lsr"); "asr", INFIX4("asr") diff --git a/lib/pervasives.epi b/lib/pervasives.epi index a7501ab..86fabf3 100644 --- a/lib/pervasives.epi +++ b/lib/pervasives.epi @@ -23,6 +23,7 @@ val fun (>)(int;int) returns (bool) val fun (>.)(float;float) returns (bool) val fun (not)(bool) returns (bool) val fun (or)(bool;bool) returns (bool) +val fun (xor)(bool;bool) returns (bool) val fun (~-)(int) returns (int) val fun (~-.)(float) returns (float)