June 2006 - Projects

XRM 75: Factor common code between different parsers.
by SIGOURE Benoit 16 Jun '06

16 Jun '06

https://svn.lrde.epita.fr/svn/xrm/trunk Index: ChangeLog from SIGOURE Benoit <sigoure.benoit(a)lrde.epita.fr> Factor common code between different parsers. * src/tools/parse-pctl.str, * src/tools/parse-xrm.str, * src/tools/parse-prism.str, * src/tools/parse-xpctl.str: Move redundant code ... * src/tools/parser-common.str: ... here. * TODO: Bring up to date. TODO | 26 ++++++++++++++++++++++++++ src/tools/parse-pctl.str | 43 +++++-------------------------------------- src/tools/parse-prism.str | 43 +++++-------------------------------------- src/tools/parse-xpctl.str | 43 +++++-------------------------------------- src/tools/parse-xrm.str | 43 +++++-------------------------------------- src/tools/parser-common.str | 38 +++++++++++++++++++++++++++++++++++++- 6 files changed, 83 insertions(+), 153 deletions(-) Index: src/tools/parse-pctl.str --- src/tools/parse-pctl.str (revision 74) +++ src/tools/parse-pctl.str (working copy) @@ -1,5 +1,3 @@ -// Code mostly from parse-java by Martin Bravenboer <martin(a)cs.uu.nl> - module parse-pctl imports libxtclib // FIXME: import libstratego-xtc for strc 0.17 @@ -10,37 +8,13 @@ main-parse-pctl = // xtc-io-wrap(extra-opts, usage, about, deps, s) xtc-io-wrap( - parse-pctl-options - , parse-pctl-usage + parser-options + , parser-usage , parser-about , !["sglr", "implode-asfix", "PCTL.tbl", "pp-aterm"] - , parse-pctl + , parser-main ) - parse-pctl-options = - symbol-option - + preserve-comments-option - + preserve-positions-option - + pp-aterm-option - + allow-amb-option - -strategies - - parse-pctl = - where(?FILE(input-file-name) + !"stdin" => input-file-name) - ; xtc-sglr-no-heuristics(get-parse-table, get-start-symbol) - ; if must-preserve-comments then - xtc-transform(!"asfix-anno-comments", pass-verbose) - end - ; if must-preserve-positions then - xtc-transform(!"addPosInfo", !["-p", input-file-name - | <pass-verbose>()]) - end - ; xtc-implode-asfix - ; if must-pp-aterm then - xtc-transform(!"pp-aterm", pass-verbose) - end - strategies symbol-option = @@ -77,12 +51,5 @@ */ strategies - parse-pctl-usage = - <tool-doc> - [ Usage("parse-pctl [OPTIONS]") - , Summary( - "Parses a PCTL source file to an abstract syntax - tree in the ATerm format.") - , OptionUsage() - , AutoReportBugs() - ] + parser-usage = + template-parser-usage(|"parse-pctl", "PCTL") Index: src/tools/parse-xrm.str --- src/tools/parse-xrm.str (revision 74) +++ src/tools/parse-xrm.str (working copy) @@ -1,5 +1,3 @@ -// Code mostly from parse-java by Martin Bravenboer <martin(a)cs.uu.nl> - module parse-xrm imports libxtclib // FIXME: import libstratego-xtc for strc 0.17 @@ -10,37 +8,13 @@ main-parse-xrm = // xtc-io-wrap(extra-opts, usage, about, deps, s) xtc-io-wrap( - parse-xrm-options - , parse-xrm-usage + parser-options + , parser-usage , parser-about , !["sglr", "implode-asfix", "XRM.tbl", "pp-aterm"] - , parse-xrm + , parser-main ) - parse-xrm-options = - symbol-option - + preserve-comments-option - + preserve-positions-option - + pp-aterm-option - + allow-amb-option - -strategies - - parse-xrm = - where(?FILE(input-file-name) + !"stdin" => input-file-name) - ; xtc-sglr-no-heuristics(get-parse-table, get-start-symbol) - ; if must-preserve-comments then - xtc-transform(!"asfix-anno-comments", pass-verbose) - end - ; if must-preserve-positions then - xtc-transform(!"addPosInfo", !["-p", input-file-name - | <pass-verbose>()]) - end - ; xtc-implode-asfix - ; if must-pp-aterm then - xtc-transform(!"pp-aterm", pass-verbose) - end - strategies symbol-option = @@ -77,12 +51,5 @@ */ strategies - parse-xrm-usage = - <tool-doc> - [ Usage("parse-xrm [OPTIONS]") - , Summary( - "Parses an eXtended Reactive Module source file to an abstract syntax - tree in the ATerm format.") - , OptionUsage() - , AutoReportBugs() - ] + parser-usage = + template-parser-usage(|"parse-xrm", "eXtended Reactive Modules") Index: src/tools/parse-prism.str --- src/tools/parse-prism.str (revision 74) +++ src/tools/parse-prism.str (working copy) @@ -1,5 +1,3 @@ -// Code mostly from parse-java by Martin Bravenboer <martin(a)cs.uu.nl> - module parse-prism imports libxtclib // FIXME: import libstratego-xtc for strc 0.17 @@ -10,37 +8,13 @@ main-parse-prism = // xtc-io-wrap(extra-opts, usage, about, deps, s) xtc-io-wrap( - parse-prism-options - , parse-prism-usage + parser-options + , parser-usage , parser-about , !["sglr", "implode-asfix", "PRISM.tbl", "pp-aterm"] - , parse-prism + , parser-main ) - parse-prism-options = - symbol-option - + preserve-comments-option - + preserve-positions-option - + pp-aterm-option - + allow-amb-option - -strategies - - parse-prism = - where(?FILE(input-file-name) + !"stdin" => input-file-name) - ; xtc-sglr-no-heuristics(get-parse-table, get-start-symbol) - ; if must-preserve-comments then - xtc-transform(!"asfix-anno-comments", pass-verbose) - end - ; if must-preserve-positions then - xtc-transform(!"addPosInfo", !["-p", input-file-name - | <pass-verbose>()]) - end - ; xtc-implode-asfix - ; if must-pp-aterm then - xtc-transform(!"pp-aterm", pass-verbose) - end - strategies symbol-option = @@ -77,12 +51,5 @@ */ strategies - parse-prism-usage = - <tool-doc> - [ Usage("parse-prism [OPTIONS]") - , Summary( - "Parses a PRISM source file to an abstract syntax - tree in the ATerm format.") - , OptionUsage() - , AutoReportBugs() - ] + parser-usage = + template-parser-usage(|"parse-prism", "PRISM") Index: src/tools/parser-common.str --- src/tools/parser-common.str (revision 74) +++ src/tools/parser-common.str (working copy) @@ -1,9 +1,35 @@ -// used by parse-prism and parse-xrm to factorize common strategies +// used by parse-* to factor common strategies module parser-common strategies + parser-main = + where(?FILE(input-file-name) + !"stdin" => input-file-name) + ; xtc-sglr-no-heuristics(get-parse-table, get-start-symbol) + ; if must-preserve-comments then + xtc-transform(!"asfix-anno-comments", pass-verbose) + end + ; if must-preserve-positions then + xtc-transform(!"addPosInfo", !["-p", input-file-name + | <pass-verbose>()]) + end + ; xtc-implode-asfix + ; if must-pp-aterm then + xtc-transform(!"pp-aterm", pass-verbose) + end + +strategies + + parser-options = + symbol-option + + preserve-comments-option + + preserve-positions-option + + pp-aterm-option + + allow-amb-option + +strategies + /* sglr options: ** -fi: heuristic: injection count ** -fe: heuristic: eagerness @@ -84,6 +110,16 @@ */ strategies + template-parser-usage(|parser-name, language) = + <tool-doc> + [ Usage(<concat-strings>[parser-name, " [OPTIONS]"]) + , Summary(<concat-strings>[ + "Parses a ", language, " source file to an abstract syntax + tree in the ATerm format."]) + , OptionUsage() + , AutoReportBugs() + ] + parser-about = <tool-doc> [ AutoProgram() Index: src/tools/parse-xpctl.str --- src/tools/parse-xpctl.str (revision 74) +++ src/tools/parse-xpctl.str (working copy) @@ -1,5 +1,3 @@ -// Code mostly from parse-java by Martin Bravenboer <martin(a)cs.uu.nl> - module parse-xpctl imports libxtclib // FIXME: import libstratego-xtc for strc 0.17 @@ -10,37 +8,13 @@ main-parse-xpctl = // xtc-io-wrap(extra-opts, usage, about, deps, s) xtc-io-wrap( - parse-xpctl-options - , parse-xpctl-usage + parser-options + , parser-usage , parser-about , !["sglr", "implode-asfix", "XPCTL.tbl", "pp-aterm"] - , parse-xpctl + , parser-main ) - parse-xpctl-options = - symbol-option - + preserve-comments-option - + preserve-positions-option - + pp-aterm-option - + allow-amb-option - -strategies - - parse-xpctl = - where(?FILE(input-file-name) + !"stdin" => input-file-name) - ; xtc-sglr-no-heuristics(get-parse-table, get-start-symbol) - ; if must-preserve-comments then - xtc-transform(!"asfix-anno-comments", pass-verbose) - end - ; if must-preserve-positions then - xtc-transform(!"addPosInfo", !["-p", input-file-name - | <pass-verbose>()]) - end - ; xtc-implode-asfix - ; if must-pp-aterm then - xtc-transform(!"pp-aterm", pass-verbose) - end - strategies symbol-option = @@ -77,12 +51,5 @@ */ strategies - parse-xpctl-usage = - <tool-doc> - [ Usage("parse-xpctl [OPTIONS]") - , Summary( - "Parses an eXtended Properties source file to an abstract syntax - tree in the ATerm format.") - , OptionUsage() - , AutoReportBugs() - ] + parser-usage = + template-parser-usage(|"parse-xpctl", "eXtended Properties") Index: TODO --- TODO (revision 74) +++ TODO (working copy) @@ -103,6 +103,23 @@ end end + * Fix the rand builtin. Instead of generating an extra module to host the + random variable and generate random numbers, host the random variable in + the module that called rand. Update the random variable each time it's + accessed to ensure good randomness, eg: + module random => module random + x : [0..51] init 0; => x : [0..51] init 0; + [] true -> x'=rand(42); => __rand_0 : [0..42]; // no init here + endmodule => [] true -> x'=__rand_0 + + => 1/43:(__rand_0'=0) + ... + + => 1/43:(__rand_0'=42); + => endmodule + + * Generalize the ranges. Instead of writing rand (42, 51), write: + rand (42 .. 51) + So that rand (42) always returns 42 and rand (42, 51) returns either 42 + or 51. + ## -------------- ## ## Desugarisation ## ## -------------- ## @@ -177,6 +194,15 @@ loops and then later try to group them? Would there be cases where grouping gets tricky? What about d_2 above? + * Don't use external parsers/pretty-printers in xrm-front. This leads to + many /tmp files and implies a great performance penalty on big + inputs/outputs. Instead, factor each parser in an external library linked + to xrm-front (preferably a static library because dynamic libraries must + be installed in the right path or require messing up with + LD_LIBRARY_PATH). This way, no external process will be involved. See if + we can also get rid of pp-aterm by using it directly through + libstratego-gpp. + ## ----- ## ## Notes ## ## ----- ##

1 0

monoburg 60: Fix the recipient of Vcs' messages
by Roland Levillain 16 Jun '06

16 Jun '06

Vcs' messages go to the projects list instead of the tiger-patches list, as for Nolimips and HAVM. https://svn.lrde.epita.fr/svn/monoburg ChangeLog | 7 +++++++ vcs/monoburg.rb | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix the recipient of Vcs' messages. * vcs/monoburg.rb (Vcs::monoburg_commit): Send messages to projects(a)lrde.epita.fr. 2006-06-16 Roland Levillain <roland(a)lrde.epita.fr> Index: vcs/monoburg.rb --- vcs/monoburg.rb (révision 58) +++ vcs/monoburg.rb (copie de travail) @@ -7,7 +7,7 @@ def monoburg_commit! ( *args ) common_commit!("monoburg <%= rev %>: <%= title %>", *args) do |subject| - mail!(:to => %w[tiger-patches(a)lrde.epita.fr], :subject => subject) + mail!(:to => %w[projects(a)lrde.epita.fr], :subject => subject) end end alias_command :mbci, :monoburg_commit

1 0

monoburg 59: Update NEWS
by Roland Levillain 16 Jun '06

16 Jun '06

I made this change to let MonoBURG distcheck on the build farm. https://svn.lrde.epita.fr/svn/monoburg ChangeLog | 4 ++++ NEWS | 7 +++++++ 2 files changed, 11 insertions(+) Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * NEWS: Update. Index: NEWS --- NEWS (révision 58) +++ NEWS (copie de travail) @@ -1,3 +1,7 @@ +* New in 1.0.5a: + + + * New in 1.0.5, 2006-02-01: ** Rework MonoBURG options @@ -29,6 +33,7 @@ #line 1 "./tree.brg" + * 1.0.4 ** Support named subtree with multi rules @@ -39,6 +44,7 @@ Moreover, Name3 could be renamed Name1. The only restriction is that Name4 couldn't be named Name1 nor Name3. + * 1.0.3 ** Add --with-line option @@ -53,6 +59,7 @@ Depths of `%namespace' and `%include' are no more limited. + * 1.0.2a ** Reoganization of the sources

1 0

Re: XRM 74: Add XPCTL in XRM.
by Akim Demaille 16 Jun '06

16 Jun '06

>>> "SIGOURE" == SIGOURE Benoit <sigoure.benoit(a)lrde.epita.fr> writes: > + If you wish, it is possible to specify properties directly in XRM files. > + You can add property sections to your XRM files. Property sections can be > + found everywhere a module declaration can be found. A property section is > + specified as: > + properties > + // XPCTL code here > + end > + If you use property sections, you will need to pass an additional argument > + to xrm-front to specify the PCTL property file where the options must be > + saved. The option switch is --p-output f or -po f (where `f' is a path). > + However, this option is not mandatory. If you specify property sections but > + omit this switch, xrm-front will discard the properties and issue a warning > + about that. Many thanks!

1 0

XRM 74: Add XPCTL in XRM.
by SIGOURE Benoit 15 Jun '06

15 Jun '06

https://svn.lrde.epita.fr/svn/xrm/trunk Index: ChangeLog from SIGOURE Benoit <sigoure.benoit(a)lrde.epita.fr> Add XPCTL in XRM. It is now possible to specify properties in property sections directly in XRM (see the update to user-guide.txt). * src/lib/xrm/pp/xrm-properties.meta: New. * src/lib/xrm/pp/pp-xrm-to-box.str: Import xrm-properties. * src/lib/xrm/pp/xrm-properties.str: New. * src/str/xrm-to-prism.str: Handle properties in XRM. * src/str/xrm-front.str: Add the --p-output | -po option. * src/str/properties-in-xrm.str: New. * src/syn/xrm/XRM-Main.sdf: Import XRM-Properties. * src/syn/xrm/XRM-Module.sdf: Make it possible to end the declaration of a module with `end' instead of `endmodule'. * src/syn/xrm/Makefile.am: Bring up to date. * src/syn/xpctl/Makefile.am: Ditto. * src/syn/xrm/XRM-Properties.sdf: New. * tests/xrm/properties-in-xrm.xrm: New. * doc/user-guide.txt: Bring up to date. doc/user-guide.txt | 14 +++++++++ src/lib/xrm/pp/pp-xrm-to-box.str | 1 src/lib/xrm/pp/xrm-properties.meta | 1 src/lib/xrm/pp/xrm-properties.str | 9 +++++ src/str/properties-in-xrm.str | 56 +++++++++++++++++++++++++++++++++++++ src/str/xrm-front.str | 7 ++-- src/str/xrm-to-prism.str | 10 +++++- src/syn/xpctl/Makefile.am | 6 +++ src/syn/xrm/Makefile.am | 7 +++- src/syn/xrm/XRM-Main.sdf | 1 src/syn/xrm/XRM-Module.sdf | 6 +++ src/syn/xrm/XRM-Properties.sdf | 11 +++++++ tests/xrm/properties-in-xrm.xrm | 9 +++++ 13 files changed, 129 insertions(+), 9 deletions(-) Index: src/lib/xrm/pp/xrm-properties.meta --- src/lib/xrm/pp/xrm-properties.meta (revision 0) +++ src/lib/xrm/pp/xrm-properties.meta (revision 0) @@ -0,0 +1 @@ +Meta([Syntax("Stratego-Box")]) Index: src/lib/xrm/pp/pp-xrm-to-box.str --- src/lib/xrm/pp/pp-xrm-to-box.str (revision 73) +++ src/lib/xrm/pp/pp-xrm-to-box.str (working copy) @@ -24,6 +24,7 @@ xrm-meta-if xrm-arrays xrm-formula + xrm-properties strategies Index: src/lib/xrm/pp/xrm-properties.str --- src/lib/xrm/pp/xrm-properties.str (revision 0) +++ src/lib/xrm/pp/xrm-properties.str (revision 0) @@ -0,0 +1,9 @@ +module xrm-properties + +rules + prism-to-box: + Properties(properties-file-section) + -> V [ V is=2 [ KW["properties"] + ~*properties-file-section ] + KW["end"] + ] Index: src/str/xrm-to-prism.str --- src/str/xrm-to-prism.str (revision 73) +++ src/str/xrm-to-prism.str (working copy) @@ -37,6 +37,7 @@ array-decl-desugar builtin-rand log-timed + properties-in-xrm strategies @@ -85,7 +86,7 @@ * This must come AFTER collect-static-const-decl since we might need * to expand an arrays which rely on static const variables. */ - ; log-timed(topdown(try(array-decl-desugar); try(EvalStaticRand)) + ; log-timed(topdown(try(array-decl-desugar + EvalStaticRand)) | "Desugaring array declarations", 2) /* flatten nested lists */ @@ -126,7 +127,12 @@ ; if <is-module-file> start-symbol then /* re-order modules so that all declarations appear before commands */ - log-timed(ModulesFile(id, map(try(reorder-module-contents))) + log-timed-reentrant( + ModulesFile( + id, + map(try(reorder-module-contents + collect-properties)) + ) + ; write-properties | "Reordering module contents", 2) end Index: src/str/xrm-front.str --- src/str/xrm-front.str (revision 73) +++ src/str/xrm-front.str (working copy) @@ -63,6 +63,7 @@ + desugar-option + parse-pctl-option + seed-option + + prop-output-option /** checks the options are consistent */ check-options = @@ -156,9 +157,9 @@ seed-option = ArgOption("-s" + "--seed" , set-seed-option - , !HelpString("-s | --seed", "Set the random seed used for static_rand's - values. Default is the current UNIX - timestamp.") + , !HelpString("-s | --seed i", + "Set the random seed used for static_rand's values. + Default is the current UNIX timestamp.") ) set-seed-option = Index: src/str/properties-in-xrm.str --- src/str/properties-in-xrm.str (revision 0) +++ src/str/properties-in-xrm.str (revision 0) @@ -0,0 +1,56 @@ +/** +** This module is about embedded XPCTL in XRM. +*/ +module properties-in-xrm + +rules + + collect-properties: + Properties(properties-file-section) -> [] + where rules(SavedProperties:+ _ -> properties-file-section) + +strategies + + /** + ** Write properties found to the file specified by the --p-output (or -po) + ** switch. Issue a warning if the switch wasn't passed to xrm-front but we + ** have indeed collected properties (because in this case, they will be + ** discarded). + */ + write-properties = + where( + get-prop-output-option => prop-out-file + ; bagof-SavedProperties + ; reverse + ; if (!prop-out-file => []) then + if ?[_|_] then + warn-msg(|"Properties ignored: you didn't pass --p-output or -po.") + end + else + log-timed( + flatten-list + ; !PropertiesFile(<id>) + ; write-to => FILE(tmp-file) + ; <xtc-command(!"pp-pctl")> [ "-i", tmp-file + , "-o", prop-out-file + | <pass-verbose>() ] + | <concat-strings>["Writing properties to ", prop-out-file], 2) + end + ) // end of where + +strategies + + prop-output-option = + ArgOption("-po" + "--p-output" + , set-prop-output-option + , !HelpString("-po | --p-output f", + "Write properties found to the file f + (default: discard properties)") + ) + + set-prop-output-option = + <set-config> ("prop-output", <id>) + + get-prop-output-option = + <get-config> "prop-output" <+ ![] // empty list = don't output properties + // (discard them) Index: src/syn/xrm/XRM-Main.sdf --- src/syn/xrm/XRM-Main.sdf (revision 73) +++ src/syn/xrm/XRM-Main.sdf (working copy) @@ -12,3 +12,4 @@ XRM-Formula XRM-Constant XRM-Keywords + XRM-Properties Index: src/syn/xrm/XRM-Module.sdf --- src/syn/xrm/XRM-Module.sdf (revision 73) +++ src/syn/xrm/XRM-Module.sdf (working copy) @@ -6,7 +6,9 @@ %% EBNF Grammar: eXtended Modules %% DeclarationOrCommand ::= Declaration | Command - %% Module ::= "module" ArrayAccess Declaration* Command* "endmodule" + %% Module ::= + %% "module" ArrayAccess Declaration* Command* "endmodule" + %% | "module" ArrayAccess Declaration* Command* "end" sorts DeclarationOrCommand context-free syntax @@ -16,3 +18,5 @@ context-free syntax "module" ArrayAccess DeclarationOrCommand* "endmodule" -> Module {cons("Module")} + "module" ArrayAccess DeclarationOrCommand* "end" + -> Module {cons("Module")} Index: src/syn/xrm/Makefile.am --- src/syn/xrm/Makefile.am (revision 73) +++ src/syn/xrm/Makefile.am (working copy) @@ -5,7 +5,7 @@ ## Mail <sigoure.benoit(a)lrde.epita.fr> ## ## Started on Thu Apr 27 17:40:41 2006 SIGOURE Benoit -## Last update Sun Jun 11 02:39:02 2006 SIGOURE Benoit +## Last update Thu Jun 15 13:26:29 2006 SIGOURE Benoit ## include $(top_srcdir)/config/Transformers.mk @@ -17,7 +17,9 @@ STRINCLUDES = -I $(srcdir) SDFINCLUDES = -I $(srcdir) \ -I $(STRATEGO_FRONT)/share/sdf/stratego-front \ - -I $(top_srcdir)/src/syn/prism + -I $(top_srcdir)/src/syn/prism \ + -I $(top_srcdir)/src/syn/pctl \ + -I $(top_srcdir)/src/syn/xpctl nodist_pkgdata_DATA = \ XRM.def \ @@ -56,6 +58,7 @@ XRM-MetaIfExp.sdf \ XRM-MetaVars.sdf \ XRM-Module.sdf \ + XRM-Properties.sdf \ XRM-StartSymbols.sdf \ XRM-Update.sdf \ XRM.sdf Index: src/syn/xrm/XRM-Properties.sdf --- src/syn/xrm/XRM-Properties.sdf (revision 0) +++ src/syn/xrm/XRM-Properties.sdf (revision 0) @@ -0,0 +1,11 @@ +module XRM-Properties +imports + XPCTL +exports + + %% EBNF Grammar: XPCTL embeddings in XRM + %% ModulesFileSection ::= "properties" PropertiesFileSection* "end" + + context-free syntax + "properties" PropertiesFileSection* "end" + -> ModulesFileSection {cons("Properties")} Index: src/syn/xpctl/Makefile.am --- src/syn/xpctl/Makefile.am (revision 73) +++ src/syn/xpctl/Makefile.am (working copy) @@ -5,7 +5,7 @@ ## Mail <sigoure.benoit(a)lrde.epita.fr> ## ## Started on Sat Jun 10 00:17:31 2006 SIGOURE Benoit -## Last update Sun Jun 11 02:42:19 2006 SIGOURE Benoit +## Last update Thu Jun 15 13:25:48 2006 SIGOURE Benoit ## include $(top_srcdir)/config/Transformers.mk @@ -42,9 +42,13 @@ XPCTL-Prefixed.def SDFS = \ + StrategoXPCTL.sdf \ XPCTL-Main.sdf \ + XPCTL-MetaCongruences.sdf \ XPCTL-MetaFor.sdf \ XPCTL-MetaIf.sdf \ + XPCTL-MetaVars.sdf \ + XPCTL-PropertiesFile.sdf \ XPCTL-StartSymbols.sdf \ XPCTL.sdf Index: tests/xrm/properties-in-xrm.xrm --- tests/xrm/properties-in-xrm.xrm (revision 0) +++ tests/xrm/properties-in-xrm.xrm (revision 0) @@ -0,0 +1,9 @@ +module sample + x : [0..51] init 0; + [] true -> x'=static_rand(42); + [] true -> x'=rand(42); +endmodule + +properties + Pmin =? [ X x=42 ] +end Index: doc/user-guide.txt --- doc/user-guide.txt (revision 73) +++ doc/user-guide.txt (working copy) @@ -402,6 +402,20 @@ It is also possible to define formulas and parameterized formulas in XPCTL files. + If you wish, it is possible to specify properties directly in XRM files. + You can add property sections to your XRM files. Property sections can be + found everywhere a module declaration can be found. A property section is + specified as: + properties + // XPCTL code here + end + If you use property sections, you will need to pass an additional argument + to xrm-front to specify the PCTL property file where the options must be + saved. The option switch is --p-output f or -po f (where `f' is a path). + However, this option is not mandatory. If you specify property sections but + omit this switch, xrm-front will discard the properties and issue a warning + about that. + ************************ * Forthcoming features * ************************

1 0

Re: XRM 64: Use --verbose instead of --statistics.
by Tsuna 15 Jun '06

15 Jun '06

On 2006-06-11, SIGOURE Benoit <sigoure.benoit(a)lrde.epita.fr> wrote: > > > Index: ChangeLog > from SIGOURE Benoit <sigoure.benoit(a)lrde.epita.fr> > > Use --verbose instead of --statistics. > This cancels the note of the previous commit. > > * src/str/log-timed.str: Use --verbose instead of --statistics. > * src/str/xrm-front.str: Change verbosity levels. > > log-timed.str | 6 +++--- > xrm-front.str | 10 +++++----- > 2 files changed, 8 insertions(+), 8 deletions(-) > > Index: src/str/log-timed.str > --- src/str/log-timed.str (revision 63) > +++ src/str/log-timed.str (working copy) > @@ -14,7 +14,7 @@ > ** printed. (default level=1) > */ > log-timed(s | msg, level) = > - if <geq>(<get-config> "--statistics", level) then > + if <geq>(<verbosity>(), level) then ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ > where( > times => start > ; print-log-msg(|msg) > @@ -42,7 +42,7 @@ > ** Same thing as log-timed but nothing will be printed until s finished. > */ > log-timed-reentrant(s | msg, level) = > - if <geq>(<get-config> "--statistics", level) then > + if <geq>(<verbosity>(), level) then ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ > where(times => start) > ; s > ; where( > @@ -68,6 +68,6 @@ > <concat-strings>["[ " > , <log-src> > , " | info ] " > - , <align-left>(' ', msg, 40) // 40 = max strlen(msg) > + , <align-left>(' ', msg, 36) // 36 = max strlen(msg) > ] > ; log-puts -- SIGOURE Benoit aka Tsuna _____ /EPITA\ Promo 2008.CSI Rock & tRoll

2 4

Re: XRM 72: Fix test suit.
by michael.cadilhac＠lrde.org 14 Jun '06

14 Jun '06

SIGOURE Benoit <sigoure.benoit(a)lrde.epita.fr> writes: > [[PGP Signed Part:Failed] > Signature made Wed 14 Jun 2006 03:30:22 PM CEST using DSA key ID 00BC3D49 > requesting key 00BC3D49 from hkp server keyserver.kjsl.com > no valid OpenPGP data found. > Total number processed: 0 > Can't check signature: public key not found > gpgkeys: key C3013AEF00BC3D49 not found on keyserver > [GNUPG:] IMPORT_RES 0 0 0 0 0 0 0 0 0 0 0 0 0 0 > [GNUPG:] ERRSIG C3013AEF00BC3D49 17 2 01 1150291822 9 > [GNUPG:] NO_PUBKEY C3013AEF00BC3D49 gpg --send-keys -- | Pour les 35-40 ans, l'humour Michaël `Micha' Cadilhac | | c'est une plus-value. cadilh_m - Epita 2007 - CSI | | -- Guillaume L. JID: micha(a)amessage.be | `-- - - - - --'

1 0

XRM 72: Fix test suit.
by SIGOURE Benoit 14 Jun '06

14 Jun '06

https://svn.lrde.epita.fr/svn/xrm/trunk Index: ChangeLog from SIGOURE Benoit <sigoure.benoit(a)lrde.epita.fr> Fix test suit. This revision will be tagged as XRM 1.0. * tests/test-pp-prism.sh.in, * tests/test-pp-xpctl.sh.in, * tests/test-parse-pctl.sh.in, * tests/test-xrm-front.sh.in, * tests/test-parse-xrm.sh.in, * tests/test-pp-pctl.sh.in, * tests/test-parse-prism.sh.in, * tests/test-parse-xpctl.sh.in, * tests/test-pp-xrm.sh.in: Use '@srcdir@' instead of "@srcdir@". * TODO: Bring up to date. TODO | 3 --- tests/test-parse-pctl.sh.in | 2 +- tests/test-parse-prism.sh.in | 2 +- tests/test-parse-xpctl.sh.in | 2 +- tests/test-parse-xrm.sh.in | 2 +- tests/test-pp-pctl.sh.in | 2 +- tests/test-pp-prism.sh.in | 2 +- tests/test-pp-xpctl.sh.in | 2 +- tests/test-pp-xrm.sh.in | 2 +- tests/test-xrm-front.sh.in | 2 +- 10 files changed, 9 insertions(+), 12 deletions(-) Index: tests/test-pp-prism.sh.in --- tests/test-pp-prism.sh.in (revision 71) +++ tests/test-pp-prism.sh.in (working copy) @@ -11,7 +11,7 @@ test_cnt=0 test_pass=0 -srcdir="@srcdir@" +srcdir='@srcdir@' target_dir='output-pp-prism' rm -f failed_tests.$$ Index: tests/test-pp-xpctl.sh.in --- tests/test-pp-xpctl.sh.in (revision 71) +++ tests/test-pp-xpctl.sh.in (working copy) @@ -11,7 +11,7 @@ test_cnt=0 test_pass=0 -srcdir="@srcdir@" +srcdir='@srcdir@' target_dir='output-pp-xpctl' rm -f failed_tests.$$ Index: tests/test-parse-pctl.sh.in --- tests/test-parse-pctl.sh.in (revision 71) +++ tests/test-parse-pctl.sh.in (working copy) @@ -11,7 +11,7 @@ test_cnt=0 test_pass=0 -srcdir="@srcdir@" +srcdir='@srcdir@' rm -f failed_tests.$$ for file in `find "$srcdir" -name '*.pctl' -o -name '*.csl' | sort`; do Index: tests/test-xrm-front.sh.in --- tests/test-xrm-front.sh.in (revision 71) +++ tests/test-xrm-front.sh.in (working copy) @@ -11,7 +11,7 @@ test_cnt=0 test_pass=0 -srcdir="@srcdir@" +srcdir='@srcdir@' target_dir='output-xrm-front' rm -f failed_tests.$$ Index: tests/test-parse-xrm.sh.in --- tests/test-parse-xrm.sh.in (revision 71) +++ tests/test-parse-xrm.sh.in (working copy) @@ -11,7 +11,7 @@ test_cnt=0 test_pass=0 -srcdir="@srcdir@" +srcdir='@srcdir@' rm -f failed_tests.$$ for file in `find "$srcdir" -name '*.pm' -o -name '*.nm' -o -name '*.sm' -o -name '*.xpm' | sort`; do Index: tests/test-pp-pctl.sh.in --- tests/test-pp-pctl.sh.in (revision 71) +++ tests/test-pp-pctl.sh.in (working copy) @@ -11,7 +11,7 @@ test_cnt=0 test_pass=0 -srcdir="@srcdir@" +srcdir='@srcdir@' target_dir='output-pp-pctl' rm -f failed_tests.$$ Index: tests/test-parse-prism.sh.in --- tests/test-parse-prism.sh.in (revision 71) +++ tests/test-parse-prism.sh.in (working copy) @@ -11,7 +11,7 @@ test_cnt=0 test_pass=0 -srcdir="@srcdir@" +srcdir='@srcdir@' rm -f failed_tests.$$ for file in `find "$srcdir" -name '*.pm' -o -name '*.nm' -o -name '*.sm' | sort`; do Index: tests/test-parse-xpctl.sh.in --- tests/test-parse-xpctl.sh.in (revision 71) +++ tests/test-parse-xpctl.sh.in (working copy) @@ -11,7 +11,7 @@ test_cnt=0 test_pass=0 -srcdir="@srcdir@" +srcdir='@srcdir@' rm -f failed_tests.$$ for file in `find "$srcdir" -name '*.pctl' -o -name '*.csl' -o -name '*.xpctl' -o -name '*.xcsl' | sort`; do Index: tests/test-pp-xrm.sh.in --- tests/test-pp-xrm.sh.in (revision 71) +++ tests/test-pp-xrm.sh.in (working copy) @@ -11,7 +11,7 @@ test_cnt=0 test_pass=0 -srcdir="@srcdir@" +srcdir='@srcdir@' target_dir='output-pp-xrm' rm -f failed_tests.$$ Index: TODO --- TODO (revision 71) +++ TODO (working copy) @@ -50,9 +50,6 @@ * Add a sanity check after xrm-front has finished to generate everything in order to ensure that each module/var decl has a unique name. - * Transform PRISM's If into a MetaIf if the condition has meta-vars (do - this before the check-meta-vars pass) - * Add partial evaluation for Expressions which contain meta-vars. eg: x != 0 & array[x-1]=0 // prevent array[-1]

1 0

Re: XRM 62: Add the base for eXtended PCTL.
by Akim Demaille 14 Jun '06

14 Jun '06

>>> "SIGOURE" == SIGOURE Benoit <sigoure.benoit(a)lrde.epita.fr> writes: > Index: src/tools/parse-xpctl.str > --- src/tools/parse-xpctl.str (revision 61) > +++ src/tools/parse-xpctl.str (working copy) > @@ -1,23 +1,23 @@ > // Code mostly from parse-java by Martin Bravenboer <martin(a)cs.uu.nl> > -module parse-xrm > +module parse-xpctl > imports > libxtclib // FIXME: import libstratego-xtc for strc 0.17 > tool-doc > parser-common > strategies > - main-parse-xrm = > + main-parse-xpctl = > // xtc-io-wrap(extra-opts, usage, about, deps, s) > xtc-io-wrap( > - parse-xrm-options > - , parse-xrm-usage > + parse-xpctl-options > + , parse-xpctl-usage > , parser-about > - , !["sglr", "implode-asfix", "XRM.tbl", "pp-aterm"] > - , parse-xrm > + , !["sglr", "implode-asfix", "XPCTL.tbl", "pp-aterm"] > + , parse-xpctl > ) Again, duplication. This is really worrying.

2 3

Re: XRM 69: Use $srcdir instead of @srcdir@.
by Akim Demaille 14 Jun '06

14 Jun '06

>>> "SIGOURE" == SIGOURE Benoit <sigoure.benoit(a)lrde.epita.fr> writes: > +srcdir="@srcdir@" I'm not sure why you didn't take single quotes.

1 0