Merge branch master (Spot 1.2.5) into next.
* src/bin/dstar2tgba.cc, src/bin/ltlcross.cc, src/bin/randltl.cc, src/ltltest/reduccmp.test, src/neverparse/neverclaimparse.yy, src/tgbatest/ltl2ta.test, src/tgbatest/ltl2tgba.cc, src/tgbatest/ltlcross.test, src/tgbatest/neverclaimread.test, wrap/python/ajax/ltl2tgba.html: Fix conflicts.
This commit is contained in:
Alexandre Duret-Lutz
commit
700cf88b06
30 changed files with 1029 additions and 163 deletions
|
|
@ -130,3 +130,7 @@ table.ltltable
|
|||
white-space: pre;
|
||||
font-size: 1.1em;
|
||||
}
|
||||
|
||||
#ltl3ba-tab {
|
||||
margin-left: 1em;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -489,6 +489,10 @@ an identifier: <span class="formula">aUb</span> is an atomic proposition, unlike
|
|||
<INPUT type="radio" name="ff" value="i">
|
||||
text in Spin's syntax
|
||||
</label><br>
|
||||
<label class="rtip" title="This output can be given to LBT, LBTT, ltl2dstar, scheck, or any other tool using a similar syntax. Spot can also read it back. The original syntax only support atomic propositions named <span class='formula'>p0</span>, <span class='formula'>p1</span>, etc. As an extension, also supported by ltl2dstar, other atomic proposition are enclosed in double quotes. PSL formulas are not supported.">
|
||||
<INPUT type="radio" name="ff" value="l">
|
||||
text in LBT's syntax
|
||||
</label><br>
|
||||
<label class="rtip" title="A graphical representation of Spot's internal representation. Actually this is not a tree but an acyclic graph, because equal subformulas are shared.">
|
||||
<INPUT type="radio" name="ff" value="g">
|
||||
a syntactic tree
|
||||
|
|
@ -564,10 +568,10 @@ an identifier: <span class="formula">aUb</span> is an atomic proposition, unlike
|
|||
<div id="translator-tabs" class="tabs collapsible shadow">
|
||||
<ul class="head">
|
||||
<li>Translator Algorithm:</li>
|
||||
<li><a href="#tabs-tfm" class="btip" title="A tableau construction that uses BDDs to symbolically represent each state of the automaton. This is the best algorithm of the three, and the only one that has been extended to support PSL operators.">Couvreur/FM</a></li>
|
||||
<li><a href="#tabs-tfm" class="btip" title="A tableau construction that uses BDDs to symbolically represent each state of the automaton. This produces better results than Tauriainen/TAA, and is the only algorithm that has been extended to support PSL operators.">Couvreur/FM</a></li>
|
||||
<li><a href="#tabs-tta" class="btip" title="An implementation of Heikki Tauriainen's Ph.D. thesis algorithm to translate LTL formulas via very weak alternating automata with transition-based generalized acceptance conditions.">Tauriainen/TAA</a></li>
|
||||
<li><a href="#tabs-tl3" class="btip" title="An improved version of LTL2BA, overhauled by Tomáš Babiak during his Ph.D., and described at TACAS'12.<br>LTL3BA is not part of Spot. Options in this tab correspond to options offered by LTL3BA, and have some overlap with the options offered by Spot upstream and downstream.">LTL3BA</a></li>
|
||||
<li><a href="#tabs-tcs" class="btip" title="Compositionnal suspension.<br>To be presented at Spin'13. Suspendable formulas are formulas such as <span class='formula'>GFa</span> or <span class='formula'>FGb</span> whose verification can always be postponed by a finite number of step. In this approach, we extract all suspendable subformulas, translate them separately from the main, skeleton automaton, only to merge them back in the accepting SCC.">Comp.Susp.</a></li>
|
||||
<li><a href="#tabs-tcs" class="btip" title="Compositional suspension.<br>A technique presented at Spin'13. Suspendable formulas are formulas such as <span class='formula'>GFa</span> or <span class='formula'>FGb</span> whose verification can always be postponed by a finite number of step. In this approach, we extract all suspendable subformulas, translate them separately from the main, skeleton automaton, only to merge them back in the accepting SCC. This translation uses Couvreur/FM for the intermediate parts.">Comp.Susp.</a></li>
|
||||
<li id="ltl3ba-tab"><a href="#tabs-tl3" class="btip" title="An improved version of LTL2BA, overhauled by Tomáš Babiak during his Ph.D., and described at TACAS'12.<br>LTL3BA is not part of Spot. Options in this tab correspond to options offered by LTL3BA, and have some overlap with the options offered by Spot that are still applied before (LTL simplifications) and after (automata simplifications) LTL3BA is called.">LTL3BA</a></li>
|
||||
<li class="ui-icon ui-icon-circle-arrow-n ftip">Fold</li>
|
||||
</ul>
|
||||
<input type="hidden" name="t" value="fm">
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ Type of formula output if o=f (pick one)
|
|||
|
||||
ff=o Spot syntax
|
||||
ff=i Spin syntax
|
||||
ff=l LBT syntax
|
||||
ff=g graphviz output of the AST
|
||||
ff=p property dump
|
||||
|
||||
|
|
|
|||
|
|
@ -405,9 +405,15 @@ pel = spot.empty_parse_error_list()
|
|||
f = spot.parse(formula, pel, env)
|
||||
|
||||
if pel:
|
||||
unbufprint('<div class="parse-error">')
|
||||
err = spot.format_parse_errors(spot.get_cout(), formula, pel)
|
||||
unbufprint('</div>')
|
||||
# Try the LBT parser in case someone is throwing LBT formulas at us.
|
||||
pel2 = spot.empty_parse_error_list()
|
||||
g = spot.parse_lbt(formula, pel2, env)
|
||||
if pel2:
|
||||
unbufprint('<div class="parse-error">')
|
||||
err = spot.format_parse_errors(spot.get_cout(), formula, pel)
|
||||
unbufprint('</div>')
|
||||
else:
|
||||
f = g
|
||||
|
||||
# Do not continue if we could not parse anything sensible.
|
||||
if not f:
|
||||
|
|
@ -441,7 +447,7 @@ if dored:
|
|||
# Formula manipulation only.
|
||||
if output_type == 'f':
|
||||
formula_format = form.getfirst('ff', 'o')
|
||||
# o = Spot, i = Spin, g = GraphViz, p = properties
|
||||
# o = Spot, i = Spin, l = LBT, g = GraphViz, p = properties
|
||||
if formula_format == 'o':
|
||||
unbufprint(format_formula(f))
|
||||
elif formula_format == 'i':
|
||||
|
|
@ -452,6 +458,11 @@ if output_type == 'f':
|
|||
if simpopt.reduce_size_strictly:
|
||||
s = '<br><b>Try enabling larger formula rewritings.</b>'
|
||||
unbufprint('<div class="error">The above formula contains PSL operators that Spin will not understand.%s</div>' % s)
|
||||
elif formula_format == 'l':
|
||||
if not f.is_ltl_formula():
|
||||
unbufprint('<div class="error">PSL formulas cannot be expressed in this format.</div>')
|
||||
else:
|
||||
unbufprint('<div class="formula lbt-format">' + spot.to_lbt_string(f) + '</div>')
|
||||
elif formula_format == 'g':
|
||||
render_formula(f)
|
||||
elif formula_format == 'p':
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue