Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
whizard
public
Commits
9ccfbd56
Commit
9ccfbd56
authored
Jul 01, 2019
by
Vincent Rothe
Browse files
v2.6.1
parent
4194750b
Changes
607
Hide whitespace changes
Inline
Side-by-side
BUGS
View file @
9ccfbd56
General:
* WHIZARD 2.4+ currently runs only with the NAGFOR 6.0 (or newer) and
gfortran 4.8.
5
(or newer) Fortran compilers as well as Intel ifort
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
...
...
@@ -16,10 +16,15 @@ General:
Known bugs:
* 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.3.0 there is a regression which produces invalid O'Mega
matrix element code for SUSY processes with gluino propagators. This
is fixed in 2.3.1+.
Compilers and OS specialties:
* With gfortran 4.9.1, the auto_components feature (incl. the smtest_5
self test) does not work in v2.2.2 due to a regression in that compiler.
This is fixed both in v2.2.3+ of WHIZARD as well as in v4.9.2+ of
...
...
ChangeLog
View file @
9ccfbd56
...
...
@@ -2,7 +2,38 @@ ChangeLog -- Summary of changes to the WHIZARD package
Use svn log to see detailed changes.
Version 2.6.0
Version 2.6.1
2017-11-03
RELEASE: version 2.6.1
2017-10-20
More than 5 NLO components possible at same time
2017-10-19
Gaussian cutoff for shower resonance matching
2017-10-12
Alternative (more efficient) method to generate
phase space file
2017-10-11
Bug fix for shower resonance histories for processes
with multiple components
2017-09-25
Bugfix for process libraries in shower resonance histories
2017-09-21
Correctly generate pT distribution for EPA remnants
2017-09-20
Set branching ratios for unstable particles also by hand
2017-09-14
Correctly generate pT distribution for ISR photons
##################################################################
2017-09-08
RELEASE: version 2.6.0
...
...
INSTALL
View file @
9ccfbd56
...
...
@@ -107,11 +107,11 @@ WHIZARD has been tested and partially developed under MAC OS X
Darwin 9.6.X-9.8.X (Leopard) and Darwin 10.0.X-10.6.X (Snow
Leopard), Darwin 10.7.X (Lion), Darwin 10.8.X (Mountain Lion),
Darwin 10.9.X (Maverick), Darwin 10.10.X (Yosemite), Darwin
10.11.X (El Capitan) as well as Darwin 10.12.X (Sierra)
.
The single pass linker here forces to
explicitly include static
C++ libraries when externally linking
PYTHIA8, HepMC, FastJet,
LHAPDF or LCIO. The necessary flags
are automatically taken
care of by the configure script.
10.11.X (El Capitan) as well as Darwin 10.12.X (Sierra)
and
10.13.X (High Sierra).
The single pass linker here forces to
explicitly include static
C++ libraries when externally linking
PYTHIA8, HepMC, FastJet,
LHAPDF or LCIO. The necessary flags
are automatically taken
care of by the configure script.
Darwin >= 10.11: The security measures of the new
Darwin systems do not allow e.g. environment variables passed
...
...
NEWS
View file @
9ccfbd56
...
...
@@ -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.
0
version 2.6.
1
for details cf. the ChangeLog file
TODO
View file @
9ccfbd56
...
...
@@ -8,16 +8,11 @@ WHIZARD Core
- Mathematica interface
- Parton shower matching (MLM done, CKKW pending)
- GUI extension (partially done)
- parallelization (OpenMP done, MPI in progress)
- Dark Matter
- Use omega restrictions on diagrams for phase space
* 3.0
- Tau decay module
Technical stuff
- include STAT and ERRMSG in allocate and deallocate statements (?)
O'Mega
* 2.6
- arbitrary Lorentz structure
...
...
circe1/share/doc/circe1.pdf
View file @
9ccfbd56
No preview for this file type
circe2/share/doc/circe2.pdf
View file @
9ccfbd56
No preview for this file type
circe2/src/circe2.f90
View file @
9ccfbd56
...
...
@@ -372,7 +372,7 @@ contains
return
end
if
if
(
ierror
.gt.
0
)
then
write
(
*
,
'(2A)'
)
'circe2_load: '
,
'Version 2.6.
0
'
write
(
*
,
'(2A)'
)
'circe2_load: '
,
'Version 2.6.
1
'
end
if
prefix
=
index
(
design
,
'*'
)
-
1
do
...
...
circe2/src/circe2.nw
View file @
9ccfbd56
...
...
@@ -3,7 +3,7 @@
@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Implementation of [[circe2]]}
<<Version>>=
'Version 2.6.
0
'
'Version 2.6.
1
'
@
<<[[implicit none]]>>=
implicit none
...
...
omega/share/doc/omega-paper-1.pdf
View file @
9ccfbd56
No preview for this file type
omega/share/doc/omega-paper-2.pdf
View file @
9ccfbd56
No preview for this file type
omega/share/doc/omega.pdf
View file @
9ccfbd56
No preview for this file type
omega/src/UFO_lexer.ml
View file @
9ccfbd56
...
...
@@ -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
;;
...
...
omega/src/UFOx_lexer.ml
View file @
9ccfbd56
...
...
@@ -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
;;
...
...
omega/src/cascade_lexer.ml
View file @
9ccfbd56
...
...
@@ -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
=
""
;
}
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
->
...
...
@@ -227,7 +227,7 @@ and __ocaml_lex_token_rec lexbuf __ocaml_lex_state =
(
END
)
#
229
"cascade_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
;;
...
...
omega/src/config.ml
View file @
9ccfbd56
...
...
@@ -21,8 +21,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *)
let
version
=
"2.6.
0
"
let
date
=
"
Sep
0
8
2017"
let
version
=
"2.6.
1
"
let
date
=
"
Nov
0
3
2017"
let
status
=
"release"
let
default_UFO_dir
=
"/Users/reuter/local/omega/share/UFO"
...
...
omega/src/fusion.ml
View file @
9ccfbd56
...
...
@@ -1826,30 +1826,53 @@ i*)
M
.
flavor_to_string
wf
.
A
.
flavor
^
"["
^
String
.
concat
"/"
(
List
.
map
p2s
(
P
.
to_ints
wf
.
A
.
momentum
))
^
"]"
let
below_to_
string
transform
dag
wf
=
let
below_to_
channel
transform
ch
dag
wf
=
let
n2s
wf
=
variable
(
transform
wf
)
and
e2s
c
=
""
in
Tree2
.
to_
string
n2s
e2s
(
A
.
D
.
dependencies
dag
wf
)
Tree2
.
to_
channel
ch
n2s
e2s
(
A
.
D
.
dependencies
dag
wf
)
let
bra_to_
string
transform
dag
wf
=
let
bra_to_
channel
transform
ch
dag
wf
=
let
tree
=
A
.
D
.
dependencies
dag
wf
in
if
Tree2
.
is_singleton
tree
then
let
n2s
wf
=
variable
(
transform
wf
)
and
e2s
c
=
""
in
Tree2
.
to_
string
n2s
e2s
tree
Tree2
.
to_
channel
ch
n2s
e2s
tree
else
failwith
"Fusion.phase_space_channels: wrong topology!"
let
ket_to_string
transform
ch
dag
ket
=
"("
^
(
String
.
concat
","
(
List
.
map
(
below_to_string
transform
dag
)
(
A
.
children
ket
)))
^
")"
let
ket_to_channel
transform
ch
dag
ket
=
Printf
.
fprintf
ch
"("
;
begin
match
A
.
children
ket
with
|
[]
->
()
|
[
child
]
->
below_to_channel
transform
ch
dag
child
|
child
::
children
->
below_to_channel
transform
ch
dag
child
;
List
.
iter
(
fun
child
->
Printf
.
fprintf
ch
","
;
below_to_channel
transform
ch
dag
child
)
children
end
;
Printf
.
fprintf
ch
")"
let
phase_space_braket
transform
ch
(
bra
,
ket
)
dag
=
Printf
.
fprintf
ch
"%s: { %s }
\n
"
(
bra_to_string
transform
dag
bra
)
(
String
.
concat
" | "
(
List
.
map
(
ket_to_string
transform
ch
dag
)
ket
))
bra_to_channel
transform
ch
dag
bra
;
Printf
.
fprintf
ch
": {"
;
begin
match
ket
with
|
[]
->
()
|
[
ket1
]
->
Printf
.
fprintf
ch
" "
;
ket_to_channel
transform
ch
dag
ket1
|
ket1
::
kets
->
Printf
.
fprintf
ch
" "
;
ket_to_channel
transform
ch
dag
ket1
;
List
.
iter
(
fun
k
->
Printf
.
fprintf
ch
"
\\\n
| "
;
ket_to_channel
transform
ch
dag
k
)
kets
end
;
Printf
.
fprintf
ch
" }
\n
"
(*i Food for thought:
...
...
omega/src/tree2.ml
View file @
9ccfbd56
...
...
@@ -53,6 +53,40 @@ and children_to_string n2s e2s (e, n, children) =
(
String
.
concat
","
(
List
.
map
(
to_string
n2s
e2s
)
children
))
^
")"
let
rec
to_channel
ch
n2s
e2s
=
function
|
Leaf
n
->
Printf
.
fprintf
ch
"%s"
(
n2s
n
)
|
Node
[]
->
Printf
.
fprintf
ch
"{ }"
;
|
Node
[
children
]
->
children_to_channel
ch
n2s
e2s
children
|
Node
(
children
::
children2
)
->
Printf
.
fprintf
ch
"{ "
;
children_to_channel
ch
n2s
e2s
children
;
List
.
iter
(
fun
children
->
Printf
.
fprintf
ch
"
\\\n
| "
;
children_to_channel
ch
n2s
e2s
children
)
children2
;
Printf
.
fprintf
ch
" }"
and
children_to_channel
ch
n2s
e2s
(
e
,
n
,
children
)
=
Printf
.
fprintf
ch
"("
;
begin
match
e2s
e
with
|
""
->
()
|
s
->
Printf
.
fprintf
ch
"%s>"
s
end
;
Printf
.
fprintf
ch
"%s:"
(
n2s
n
);
begin
match
children
with
|
[]
->
()
|
[
child
]
->
to_channel
ch
n2s
e2s
child
|
child
::
children
->
to_channel
ch
n2s
e2s
child
;
List
.
iter
(
fun
child
->
Printf
.
fprintf
ch
","
;
to_channel
ch
n2s
e2s
child
)
children
end
;
Printf
.
fprintf
ch
")"
(*i
* Local Variables:
* mode:caml
...
...
omega/src/tree2.mli
View file @
9ccfbd56
...
...
@@ -31,6 +31,8 @@ val leaf : 'n -> ('n, 'e) t
val
is_singleton
:
(
'
n
,
'
e
)
t
->
bool
val
to_string
:
(
'
n
->
string
)
->
(
'
e
->
string
)
->
(
'
n
,
'
e
)
t
->
string
val
to_channel
:
out_channel
->
(
'
n
->
string
)
->
(
'
e
->
string
)
->
(
'
n
,
'
e
)
t
->
unit
(*i
* Local Variables:
...
...
omega/src/vertex_lexer.ml
View file @
9ccfbd56
...
...
@@ -21,7 +21,7 @@ let init_position fname lexbuf =
#
23
"vertex_lexer.ml"
let
__ocaml_lex_tables
=
{
Lexing
.
lex_base
=
Lexing
.
lex_base
=
"
\000\000\206\255\207\255\209\255\210\255\230\255\231\255\232\255
\
\233\255\234\255\235\255\236\255\237\255\238\255\239\255\240\255
\
\242\255\243\255\244\255\245\255\247\255\080\000\253\255\001\000
\
...
...
@@ -51,7 +51,7 @@ let __ocaml_lex_tables = {
\130\031\188\031\246\031\048\032\106\032\164\032\222\032\024\033
\
\082\033\140\033\198\033\000\034\058\034\116\034\174\034\232\034
\
\034\035\092\035\150\035\208\035
"
;
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\048\000\255\255\001\000
\
...
...
@@ -81,7 +81,7 @@ let __ocaml_lex_tables = {
\036\000\047\000\047\000\047\000\047\000\038\000\047\000\047\000
\
\047\000\047\000\047\000\047\000\047\000\043\000\047\000\047\000
\
\047\000\047\000\047\000\044\000
"
;
Lexing
.
lex_default
=
Lexing
.
lex_default
=
"
\002\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\025\000\000\000\023\000
\
...
...
@@ -111,7 +111,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\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\024\000\022\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
\
...
...
@@ -1291,7 +1291,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
"
;
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\023\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
\
...
...
@@ -2471,22 +2471,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
"
;
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
->
...
...
@@ -2770,7 +2770,7 @@ let
(
END
)
#
2772
"vertex_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
;;
...
...
Prev
1
2
3
4
5
…
31
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment