Commit 06bf1f9d authored by Vincent Rothe's avatar Vincent Rothe
Browse files

v2.6.4

parent 5cc2aed2
......@@ -4,7 +4,7 @@ General:
gfortran 4.8.4 (or newer) Fortran compilers as well as Intel ifort
17.0.4 (or newer).
[See the file EXTENSIONS for the list of Fortran 2003/2008/2015
[See the file EXTENSIONS for the list of Fortran 2003/2008/2018
features that the compiler must support.]
* WHIZARD 2.6+ incorporates all features from WHIZARD 1, making the
......@@ -16,6 +16,9 @@ General:
Known bugs:
* MPI version of WHIZARD: version 2.6.3 could produce the MPI-parallelized
version only from the svn repository, and not from the release tarball.
This was corrected for version 2.6.4.
* In version 2.6.0 the top threshold calculations do not work due to a
regression. This is fixed in 2.6.1. In version 2.6.1 all processes
......
......@@ -2,7 +2,64 @@ ChangeLog -- Summary of changes to the WHIZARD package
Use svn log to see detailed changes.
Version 2.6.3
Version 2.6.4
2018-08-23
RELEASE: version 2.6.4
2018-08-09
Infrastructure to check colored subevents
2018-07-10
Infrastructure for running WHIZARD in batch mode
2018-07-04
MPI available from distribution tarball
2018-06-03
Support Intel Fortran Compiler under MAC OS X
2018-05-07
FKS slicing parameter delta_i (initial state) implementend
2018-05-03
Refactor structure function assignment for NLO
2018-05-02
FKS slicing parameter xi_cut, delta_0 implemented
2018-04-20
Workspace subdirectory for process integration (grid/phs files)
Packing/unpacking of files at job end/start
Exporting integration results from scan loops
2018-04-13
Extended QCD NLO test suite
2018-04-09
Bugfix for Higgs Singlet Extension model
2018-04-06
Workspace subdirectory for process generation and compilation
--job-id option for creating job-specific names
2018-03-20
Bug fix for color flow matching in hadron collisions
with identical initial state quarks
2018-03-08
Structure functions quantum numbers correctly assigned for NLO
2018-02-24
Configure setup includes 'pgfortran' and 'flang'
2018-02-21
Include spin-correlated matrix elements in interactions
2018-02-15
Separate module for QED ISR structure functions
##################################################################
2018-02-10
RELEASE: version 2.6.3
......@@ -796,20 +853,20 @@ Use svn log to see detailed changes.
2011-12-09
Option --user-target added
##################################################################
2011-12-07
2011-12-07
RELEASE: version 2.0.6
2011-12-07
Bug fixes in SM_top_anom
Added missing entries to HepMC format
2011-12-06
Allow to pass options to O'Mega
Bug fix for HEPEVT block for showered/hadronized events
2011-12-01
Reenabled user plug-in for external code for
cuts, structure functions, routines etc.
......@@ -822,32 +879,32 @@ Use svn log to see detailed changes.
2011-11-23
Make WHIZARD compatible for MAC OS X Lion/XCode 4
2011-09-25
2011-09-25
WHIZARD paper published: Eur.Phys.J. C71 (2011) 1742
2011-08-16
2011-08-16
Model SM_QCD: QCD with one EW insertion
2011-07-19
2011-07-19
Explicit output channel for dvips avoids printing
2011-07-10
2011-07-10
Test suite for WHIZARD unit tests
2011-07-01
2011-07-01
Commands for matrix element tests
More OpenMP parallelization of kinematics
Added unit tests
Added unit tests
2011-06-23
2011-06-23
Conversion of CIRCE2 from F77 to F90, major
clean-up
clean-up
2011-06-14
2011-06-14
Conversion of CIRCE1 from F77 to F90
2011-06-10
2011-06-10
OpenMP parallelization of channel kinematics
(by Matthias Trudewind)
......
......@@ -3,5 +3,5 @@ NEWS -- User-visible changes for the WHIZARD package
(for NEWS on the O'Mega matrix element generator cf. its
corresponding NEWS file)
version 2.6.3
version 2.6.4
for details cf. the ChangeLog file
......@@ -48,7 +48,8 @@ the Higgs boson, and the top quark), the MSSM, the NMSSM, several types
of Little Higgs models, Universal Extra Dimensions, the 3-site Higgsless
moose model, and a generic Z' model. Model extensions or completely
different models can be added. Almost arbitrary models might be added via
interfaces to the packages FeynRules and SARAH.
interfaces to the packages FeynRules and SARAH, or via the UFO interface
of WHIZARD.
The WHIZARD manual as well as the documented source code can be found
in the subdirectory 'share/doc'. The manual describes the installation
......
......@@ -20,10 +20,6 @@ O'Mega
- model files unification
- helicity optimization (numerically done/analytically pending)
Models
* Release 2.6 (Zhijie,Simon)
- Tests for 7, 8 fermions ...
* 2.6
- W-gamma couplings to resonances
- W'
......@@ -43,8 +39,6 @@ Misc
- review gamelan (partially done, esp. docu)
VAMP
* reenable as much PURE and ELEMENTAL as possible and try to make
the `poor man's elemental procedures' in pmep.nw obsolete.
......
......@@ -372,7 +372,7 @@ contains
return
end if
if (ierror .gt. 0) then
write (*, '(2A)') 'circe2_load: ', 'Version 2.6.3'
write (*, '(2A)') 'circe2_load: ', 'Version 2.6.4'
end if
prefix = index (design, '*') - 1
do
......
......@@ -3,7 +3,7 @@
@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Implementation of [[circe2]]}
<<Version>>=
'Version 2.6.3'
'Version 2.6.4'
@
<<[[implicit none]]>>=
implicit none
......
......@@ -6,7 +6,7 @@ let unquote s =
# 8 "lexer.ml"
let __ocaml_lex_tables = {
Lexing.lex_base =
Lexing.lex_base =
"\000\000\201\255\001\000\001\000\004\000\021\000\020\000\010\000\
\022\000\002\000\027\000\005\000\028\000\024\000\029\000\029\000\
\034\000\035\000\037\000\024\000\239\255\240\255\241\255\242\255\
......@@ -32,7 +32,7 @@ let __ocaml_lex_tables = {
\216\000\205\255\216\000\225\000\213\000\221\000\217\000\225\000\
\204\255\215\000\217\000\221\000\203\255\230\000\215\000\228\000\
\202\255";
Lexing.lex_backtrk =
Lexing.lex_backtrk =
"\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
......@@ -58,7 +58,7 @@ let __ocaml_lex_tables = {
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255";
Lexing.lex_default =
Lexing.lex_default =
"\255\255\000\000\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\000\000\000\000\000\000\000\000\
......@@ -84,7 +84,7 @@ let __ocaml_lex_tables = {
\255\255\000\000\255\255\255\255\255\255\255\255\255\255\255\255\
\000\000\255\255\255\255\255\255\000\000\255\255\255\255\255\255\
\000\000";
Lexing.lex_trans =
Lexing.lex_trans =
"\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000\037\000\037\000\038\000\000\000\000\000\000\000\000\000\
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
......@@ -146,7 +146,7 @@ let __ocaml_lex_tables = {
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000\000\000\000\000\000\000\000\000\000\000\000\000";
Lexing.lex_check =
Lexing.lex_check =
"\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\000\000\000\000\036\000\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
......@@ -208,22 +208,22 @@ let __ocaml_lex_tables = {
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\255\255\255\255\255\255";
Lexing.lex_base_code =
Lexing.lex_base_code =
"";
Lexing.lex_backtrk_code =
Lexing.lex_backtrk_code =
"";
Lexing.lex_default_code =
Lexing.lex_default_code =
"";
Lexing.lex_trans_code =
Lexing.lex_trans_code =
"";
Lexing.lex_check_code =
Lexing.lex_check_code =
"";
Lexing.lex_code =
Lexing.lex_code =
"";
}
let rec token lexbuf =
__ocaml_lex_token_rec lexbuf 0
__ocaml_lex_token_rec lexbuf 0
and __ocaml_lex_token_rec lexbuf __ocaml_lex_state =
match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
| 0 ->
......@@ -501,7 +501,7 @@ and __ocaml_lex_token_rec lexbuf __ocaml_lex_state =
( END )
# 503 "lexer.ml"
| __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf;
| __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf;
__ocaml_lex_token_rec lexbuf __ocaml_lex_state
;;
......
......@@ -24,7 +24,9 @@ wo_fc_grep_Sun=`$GREP 'Sun' conftest.log | head -1`
wo_fc_grep_Lahey=`$GREP 'Lahey' conftest.log | head -1`
wo_fc_grep_PGF90=`$GREP 'pgf90' conftest.log | head -1`
wo_fc_grep_PGF95=`$GREP 'pgf95' conftest.log | head -1`
wo_fc_grep_PGFORTRAN=`$GREP 'pgfortran' conftest.log | head -1`
wo_fc_grep_PGHPF=`$GREP 'pghpf' conftest.log | head -1`
wo_fc_grep_FLANG=`$GREP 'clang version' conftest.log | head -1`
wo_fc_grep_default=`cat conftest.log | head -1`
if test -n "$wo_fc_grep_GFORTRAN"; then
......@@ -43,8 +45,12 @@ elif test -n "$wo_fc_grep_PGF90"; then
wo_cv_fc_id_string=$wo_fc_grep_PGF90
elif test -n "$wo_fc_grep_PGF95"; then
wo_cv_fc_id_string=$wo_fc_grep_PGF95
elif test -n "$wo_fc_grep_PGFORTRAN"; then
wo_cv_fc_id_string=$wo_fc_grep_PGFORTRAN
elif test -n "$wo_fc_grep_PGHPF"; then
wo_cv_fc_id_string=$wo_fc_grep_PGHPF
elif test -n "$wo_fc_grep_FLANG"; then
wo_cv_fc_id_string=$wo_fc_grep_FLANG
else
wo_cv_fc_id_string=$wo_fc_grep_default
fi
......@@ -73,8 +79,12 @@ elif test -n "$wo_fc_grep_PGF90"; then
wo_cv_fc_vendor="PGI"
elif test -n "$wo_fc_grep_PGF95"; then
wo_cv_fc_vendor="PGI"
elif test -n "$wo_fc_grep_PGFORTRAN"; then
wo_cv_fc_vendor="PGI"
elif test -n "$wo_fc_grep_PGHPF"; then
wo_cv_fc_vendor="PGI"
elif test -n "$wo_fc_grep_FLANG"; then
wo_cv_fc_vendor="flang"
else
wo_cv_fc_vendor="unknown"
fi
......@@ -104,7 +114,7 @@ NAG)
wo_cv_fc_version=[`echo $FC_ID_STRING | $SED -e 's/.* Release \([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
;;
Intel)
wo_cv_fc_version=[`echo $FC_ID_STRING | $SED -e 's/[a-zA-Z\(\)]//g;s/[0-9]\{8\}$//g' | $SED -r 's/\s+//g'`]
wo_cv_fc_version=[`echo $FC_ID_STRING | $SED -e 's/[a-zA-Z\(\)[:blank:]]//g;s/[0-9]\{8\}$//g'`]
;;
Sun)
wo_cv_fc_version=[`echo $FC_ID_STRING | $SED -e 's/.* Fortran 95 \([0-9][0-9]*\.[0-9][0-9]*\) .*/\1/'`]
......@@ -112,6 +122,9 @@ Sun)
PGI)
wo_cv_fc_version=[`echo $FC_ID_STRING | $SED -e 's/[a-zA-Z\(\)]//g;s/^[0-9]\{2\}//g;s/32.*\|64.*//g'`]
;;
flang)
wo_cv_fc_version=[`echo $FC_ID_STRING | $SED -e 's/.*clang version \([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
;;
*)
wo_cv_fc_version="unknown"
;;
......@@ -217,14 +230,39 @@ AC_SUBST([OBJ_EXT])
AC_DEFUN([WO_FC_LIBRARY_LDFLAGS],
[dnl
AC_REQUIRE([AC_PROG_FC])
case "$FC" in
nagfor*)
case $host in
*-darwin*)
system_darwin="yes"
;;
*)
system_darwin="no"
;;
esac
case $FC_VENDOR in
NAG)
WO_NAGFOR_LIBRARY_LDFLAGS()
;;
Intel)
case $host in
*-darwin*)
fcflags_tmp=$FCFLAGS
FCFLAGS="-shared-intel $FCFLAGS"
AC_FC_LIBRARY_LDFLAGS()
fc_libs_tmp=`echo $FCLIBS | $SED -e 's/\/Applications.*/ /'`
FCFLAGS=$fcflags_tmp
FCLIBS=$fc_libs_tmp
;;
*)
AC_FC_LIBRARY_LDFLAGS()
;;
esac
;;
*)
AC_FC_LIBRARY_LDFLAGS()
;;
esac
AM_CONDITIONAL([IS_IFORT_DARWIN],
[test "$system_darwin" = "yes" -a "$FC_VENDOR" = "Intel"])
])
### Check the NAG Fortran compiler
......
......@@ -4641,6 +4641,13 @@ m4_if([$1], [CXX], [
# Common symbols not allowed in MH_DYLIB files
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
case $cc_basename in
# icc used to be incompatible with GCC.
# ICC 10 doesn't accept -KPIC any more.
icc* | ifort*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
nagfor*)
# NAG Fortran compiler
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
......@@ -4717,6 +4724,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
armflang* | flang*)
# Flang and ARM HPC Compiler
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -DPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
......
......@@ -21,7 +21,7 @@ let init_position fname lexbuf =
# 23 "UFO_lexer.ml"
let __ocaml_lex_tables = {
Lexing.lex_base =
Lexing.lex_base =
"\000\000\228\255\229\255\002\000\003\000\078\000\155\000\235\255\
\236\255\165\000\238\255\177\000\240\255\241\255\242\255\243\255\
\244\255\245\255\246\255\247\255\195\000\014\001\089\001\164\001\
......@@ -30,7 +30,7 @@ let __ocaml_lex_tables = {
\227\000\072\005\147\005\222\005\041\006\122\006\228\000\197\006\
\026\007\101\007\108\003\243\004\179\007\016\007\189\007\199\007\
\185\000\231\255\030\000\230\255";
Lexing.lex_backtrk =
Lexing.lex_backtrk =
"\255\255\255\255\255\255\026\000\026\000\023\000\022\000\255\255\
\255\255\018\000\255\255\016\000\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\023\000\023\000\023\000\023\000\
......@@ -39,7 +39,7 @@ let __ocaml_lex_tables = {
\005\000\023\000\023\000\023\000\023\000\006\000\006\000\023\000\
\023\000\007\000\255\255\021\000\255\255\021\000\255\255\021\000\
\255\255\255\255\255\255\255\255";
Lexing.lex_default =
Lexing.lex_default =
"\002\000\000\000\000\000\058\000\056\000\255\255\255\255\000\000\
\000\000\255\255\000\000\255\255\000\000\000\000\000\000\000\000\
\000\000\000\000\000\000\000\000\255\255\255\255\255\255\255\255\
......@@ -48,7 +48,7 @@ let __ocaml_lex_tables = {
\040\000\255\255\255\255\255\255\255\255\046\000\046\000\255\255\
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\056\000\000\000\058\000\000\000";
Lexing.lex_trans =
Lexing.lex_trans =
"\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000\027\000\025\000\255\255\000\000\000\000\000\000\000\000\
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
......@@ -331,7 +331,7 @@ let __ocaml_lex_tables = {
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
";
Lexing.lex_check =
Lexing.lex_check =
"\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\000\000\000\000\026\000\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
......@@ -614,22 +614,22 @@ let __ocaml_lex_tables = {
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
";
Lexing.lex_base_code =
Lexing.lex_base_code =
"";
Lexing.lex_backtrk_code =
Lexing.lex_backtrk_code =
"";
Lexing.lex_default_code =
Lexing.lex_default_code =
"";
Lexing.lex_trans_code =
Lexing.lex_trans_code =
"";
Lexing.lex_check_code =
Lexing.lex_check_code =
"";
Lexing.lex_code =
Lexing.lex_code =
"";
}
let rec token lexbuf =
__ocaml_lex_token_rec lexbuf 0
__ocaml_lex_token_rec lexbuf 0
and __ocaml_lex_token_rec lexbuf __ocaml_lex_state =
match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
| 0 ->
......@@ -803,7 +803,7 @@ let
( END )
# 805 "UFO_lexer.ml"
| __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf;
| __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf;
__ocaml_lex_token_rec lexbuf __ocaml_lex_state
;;
......
......@@ -21,22 +21,22 @@ let init_position fname lexbuf =
# 23 "UFOx_lexer.ml"
let __ocaml_lex_tables = {
Lexing.lex_base =
Lexing.lex_base =
"\000\000\242\255\243\255\077\000\152\000\164\000\176\000\248\255\
\249\255\016\000\252\255\253\255\254\255\255\255\251\255\186\000\
\196\000\218\000\228\000\238\000\250\000\004\001\009\001\084\001\
\159\001";
Lexing.lex_backtrk =
Lexing.lex_backtrk =
"\255\255\255\255\255\255\011\000\012\000\009\000\008\000\255\255\
\255\255\005\000\255\255\255\255\255\255\255\255\255\255\255\255\
\010\000\255\255\010\000\255\255\009\000\009\000\255\255\255\255\
\011\000";
Lexing.lex_default =
Lexing.lex_default =
"\002\000\000\000\000\000\255\255\255\255\255\255\255\255\000\000\
\000\000\255\255\000\000\000\000\000\000\000\000\000\000\255\255\
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255";
Lexing.lex_trans =
Lexing.lex_trans =
"\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000\013\000\013\000\000\000\000\000\000\000\000\000\000\000\
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
......@@ -122,7 +122,7 @@ let __ocaml_lex_tables = {
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
";
Lexing.lex_check =
Lexing.lex_check =
"\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\000\000\000\000\255\255\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
......@@ -208,22 +208,22 @@ let __ocaml_lex_tables = {
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
";
Lexing.lex_base_code =
Lexing.lex_base_code =
"\000\000\000\000\000\000\000\000\000\000\010\000\020\000\000\000\
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000";
Lexing.lex_backtrk_code =
Lexing.lex_backtrk_code =
"\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000\000\000\000\000\000\000\004\000\004\000\000\000\000\000\
\000\000";
Lexing.lex_default_code =
Lexing.lex_default_code =
"\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000";
Lexing.lex_trans_code =
Lexing.lex_trans_code =
"\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
......@@ -259,7 +259,7 @@ let __ocaml_lex_tables = {
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000\000\000\000\000\000\000\000\000";
Lexing.lex_check_code =
Lexing.lex_check_code =
"\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
......@@ -295,12 +295,12 @@ let __ocaml_lex_tables = {
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\255\255";
Lexing.lex_code =
Lexing.lex_code =
"\255\001\255\255\000\001\255";
}
let rec token lexbuf =
lexbuf.Lexing.lex_mem <- Array.make 2 (-1); __ocaml_lex_token_rec lexbuf 0
lexbuf.Lexing.lex_mem <- Array.make 2 (-1) ; __ocaml_lex_token_rec lexbuf 0
and __ocaml_lex_token_rec lexbuf __ocaml_lex_state =
match Lexing.new_engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
| 0 ->
......@@ -394,7 +394,7 @@ let
( END )
# 396 "UFOx_lexer.ml"
| __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf;
| __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf;
__ocaml_lex_token_rec lexbuf __ocaml_lex_state
;;
......
......@@ -6,19 +6,19 @@ let unquote s =
# 8 "cascade_lexer.ml"
let __ocaml_lex_tables = {
Lexing.lex_base =
Lexing.lex_base =
"\000\000\237\255\002\000\114\000\240\255\241\255\242\255\243\255\
\244\255\245\255\001\000\247\255\248\255\249\255\250\255\251\255\
\252\255\079\000\001\000\255\255\254\255\246\255\238\255";
Lexing.lex_backtrk =
Lexing.lex_backtrk =
"\255\255\255\255\255\255\016\000\255\255\255\255\255\255\255\255\
\255\255\255\255\009\000\255\255\255\255\255\255\255\255\255\255\
\255\255\002\000\255\255\255\255\255\255\255\255\255\255";
Lexing.lex_default =
Lexing.lex_default =
"\255\255\000\000\002\000\003\000\000\000\000\000\000\000\000\000\
\000\000\000\000\255\255\000\000\000\000\000\000\000\000\000\000\
\000\000\255\255\018\000\000\000\000\000\000\000\000\000";
Lexing.lex_trans =
Lexing.lex_trans =
"\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000\019\000\019\000\020\000\000\000\000\000\000\000\000\000\
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
......@@ -66,7 +66,7 @@ let __ocaml_lex_tables = {
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
\000\000\000\000\255\255";
Lexing.lex_check =
Lexing.lex_check =
"\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\000\000\000\000\018\000\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
......@@ -114,22 +114,22 @@ let __ocaml_lex_tables = {
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
\255\255\255\255\003\000";
Lexing.lex_base_code =
Lexing.lex_base_code =
"";
Lexing.lex_backtrk_code =
Lexing.lex_backtrk_code =
"";
Lexing.lex_default_code =
Lexing.lex_default_code =
"";
Lexing.lex_trans_code =
Lexing.lex_trans_code =
"";
Lexing.lex_check_code =
Lexing.lex_check_code =
"";
Lexing.lex_code =
Lexing.lex_code =