Projects

projects@lrde.epita.fr

1049 discussions

by SIGOURE Benoit

https://svn.lrde.epita.fr/svn/xrm/trunk Index: ChangeLog from SIGOURE Benoit <sigoure.benoit(a)lrde.epita.fr> Add static const arrays. * src/str/array-decl-desugar.str: Add static const arrays. * src/syn/xrm/XRM-Formula.sdf: New. * src/syn/xrm/XRM-Constant.sdf: New. * src/syn/xrm/XRM-Main.sdf: Import XRM-Formula and XRM-Constant. * src/syn/xrm/Makefile.am: Update $(SDFS) and $(EXTRA_DIST) * src/syn/prism/Makefile.am: Ditto. * tests/xrm/consts.xpm: New. * tests/test-parse-xrm.sh.in: Add missing line. * TODO: Bring up to date. TODO | 11 ++++++-- src/str/array-decl-desugar.str | 50 +++++++++++++++++++++++++++++++++++++ src/syn/prism/Makefile.am | 14 ++++++---- src/syn/xrm/Makefile.am | 25 ++++++++++++++---- src/syn/xrm/XRM-Constant.sdf | 55 +++++++++++++++++++++++++++++++++++++++++ src/syn/xrm/XRM-Formula.sdf | 10 +++++++ src/syn/xrm/XRM-Main.sdf | 2 + tests/test-parse-xrm.sh.in | 1 tests/xrm/consts.xpm | 10 +++++++ 9 files changed, 166 insertions(+), 12 deletions(-) Index: src/str/array-decl-desugar.str --- src/str/array-decl-desugar.str (revision 35) +++ src/str/array-decl-desugar.str (working copy) @@ -76,6 +76,8 @@ [ IntDec(ArrayAccess(idf, dims'), low, up, value) ]) where update-dimensions(|dims) => (x, current-dim', dims') + + array-decl-desugar: BoolDecNoInit(ArrayAccess(idf, dims)) //-> |[ for x from 0 to ~dim step 1 do x[i] : bool; end ]| @@ -89,3 +91,51 @@ -> MetaFor(Identifier(x), Int("0"), current-dim', Int("1"), [ BoolDec(ArrayAccess(idf, dims'), value) ]) where update-dimensions(|dims) => (x, current-dim', dims') + + + + array-decl-desugar: + ConstInt(ArrayAccess(idf, dims), value) + //-> |[ for x from 0 to ~dim step 1 do const int x[i] = ~value; end ]| + -> MetaFor(Identifier(x), Int("0"), current-dim', Int("1"), + [ ConstInt(ArrayAccess(idf, dims'), value) ]) + where update-dimensions(|dims) => (x, current-dim', dims') + + array-decl-desugar: + ConstIntNoInit(ArrayAccess(idf, dims)) + //-> |[ for x from 0 to ~dim step 1 do const int x[i]; end ]| + -> MetaFor(Identifier(x), Int("0"), current-dim', Int("1"), + [ ConstIntNoInit(ArrayAccess(idf, dims')) ]) + where update-dimensions(|dims) => (x, current-dim', dims') + + + + array-decl-desugar: + ConstDouble(ArrayAccess(idf, dims), value) + //-> |[ for x from 0 to ~dim step 1 do const double x[i] = ~value; end ]| + -> MetaFor(Identifier(x), Int("0"), current-dim', Int("1"), + [ ConstDouble(ArrayAccess(idf, dims'), value) ]) + where update-dimensions(|dims) => (x, current-dim', dims') + + array-decl-desugar: + ConstDoubleNoInit(ArrayAccess(idf, dims)) + //-> |[ for x from 0 to ~dim step 1 do const double x[i]; end ]| + -> MetaFor(Identifier(x), Int("0"), current-dim', Int("1"), + [ ConstDoubleNoInit(ArrayAccess(idf, dims')) ]) + where update-dimensions(|dims) => (x, current-dim', dims') + + + + array-decl-desugar: + ConstBool(ArrayAccess(idf, dims), value) + //-> |[ for x from 0 to ~dim step 1 do const bool x[i] = ~value; end ]| + -> MetaFor(Identifier(x), Int("0"), current-dim', Int("1"), + [ ConstBool(ArrayAccess(idf, dims'), value) ]) + where update-dimensions(|dims) => (x, current-dim', dims') + + array-decl-desugar: + ConstBoolNoInit(ArrayAccess(idf, dims)) + //-> |[ for x from 0 to ~dim step 1 do const bool x[i]; end ]| + -> MetaFor(Identifier(x), Int("0"), current-dim', Int("1"), + [ ConstBoolNoInit(ArrayAccess(idf, dims')) ]) + where update-dimensions(|dims) => (x, current-dim', dims') Index: src/syn/xrm/XRM-Formula.sdf --- src/syn/xrm/XRM-Formula.sdf (revision 0) +++ src/syn/xrm/XRM-Formula.sdf (revision 0) @@ -0,0 +1,10 @@ +module XRM-Formula +imports PRISM-to-XRM +exports + + %% EBNF Grammar: Extended Formulas + %% FormulaDef ::= "formula" ArrayAccess "=" Expression ";" + + context-free syntax + "formula" ArrayAccess "=" Expression ";" + -> FormulaDef {cons("FormulaDef")} Index: src/syn/xrm/XRM-Main.sdf --- src/syn/xrm/XRM-Main.sdf (revision 35) +++ src/syn/xrm/XRM-Main.sdf (working copy) @@ -9,3 +9,5 @@ XRM-Declaration XRM-Update XRM-Command + XRM-Formula + XRM-Constant Index: src/syn/xrm/XRM-Constant.sdf --- src/syn/xrm/XRM-Constant.sdf (revision 0) +++ src/syn/xrm/XRM-Constant.sdf (revision 0) @@ -0,0 +1,55 @@ +module XRM-Constant +imports PRISM-to-XRM +exports + + %% EBNF Grammar: Extended Constants + %% ConstantDef ::= "const" "int" ArrayAccess ["=" Expression] ";" + %% | "const" "double" ArrayAccess ["=" Expression] ";" + %% | "const" "bool" ArrayAccess ["=" Expression] ";" + %% + %% (* old style constant defs for backwards compat *) + %% (* no type explicitly given => integers *) + %% | "const" ArrayAccess ["=" Expression] ";" + %% (* doubles *) + %% | "rate" ArrayAccess ["=" Expression] ";" + %% | "prob" ArrayAccess ["=" Expression] ";" + + %% FIXME: This might not be the most efficiant way of using although it + %% should work thanks to the SGLR parser. + + context-free syntax + "const" "int" ArrayAccess "=" Expression ";" + -> ConstantDef {cons("ConstInt")} + + "const" ArrayAccess "=" Expression ";" + -> ConstantDef {cons("ConstInt")} + + + + "const" "int" ArrayAccess ";" -> ConstantDef {cons("ConstIntNoInit")} + "const" ArrayAccess ";" -> ConstantDef {cons("ConstIntNoInit")} + + + + "const" "double" ArrayAccess "=" Expression ";" + -> ConstantDef {cons("ConstDouble")} + + "rate" ArrayAccess "=" Expression ";" + -> ConstantDef {cons("ConstDouble")} + + "prob" ArrayAccess "=" Expression ";" + -> ConstantDef {cons("ConstDouble")} + + + + "const" "double" ArrayAccess ";" -> ConstantDef {cons("ConstDoubleNoInit")} + "rate" ArrayAccess ";" -> ConstantDef {cons("ConstDoubleNoInit")} + "probe" ArrayAccess ";" -> ConstantDef {cons("ConstDoubleNoInit")} + + + + "const" "bool" ArrayAccess "=" Expression ";" + -> ConstantDef {cons("ConstBool")} + + "const" "bool" ArrayAccess ";" + -> ConstantDef {cons("ConstBoolNoInit")} Index: src/syn/xrm/Makefile.am --- src/syn/xrm/Makefile.am (revision 35) +++ 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 Thu May 25 17:28:59 2006 SIGOURE Benoit +## Last update Fri May 26 02:12:42 2006 SIGOURE Benoit ## include $(top_srcdir)/config/Transformers.mk @@ -41,12 +41,27 @@ XRM-StartSymbols.def \ XRM-Prefixed.def -SDFS = XRM-Expression.sdf \ +SDFS = \ + PRISM-to-XRM.sdf \ + StrategoXRM.sdf \ + XRM-Arrays.sdf \ + XRM-Command.sdf \ + XRM-Constant.sdf \ + XRM-Declaration.sdf \ + XRM-Expression.sdf \ + XRM-Formula.sdf \ + XRM-Literals.sdf \ XRM-Main.sdf \ - XRM.sdf \ - XRM-StartSymbols.sdf + XRM-MetaCongruences.sdf \ + XRM-MetaFor.sdf \ + XRM-MetaIf.sdf \ + XRM-MetaVars.sdf \ + XRM-Module.sdf \ + XRM-StartSymbols.sdf \ + XRM-Update.sdf \ + XRM.sdf -EXTRA_DIST = $(wildcard *.sdf) +EXTRA_DIST = $(SDFS) XRM.def: $(SDFS) XRM-StartSymbols.def: $(SDFS) Index: src/syn/prism/Makefile.am --- src/syn/prism/Makefile.am (revision 35) +++ src/syn/prism/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 Thu May 25 17:28:59 2006 SIGOURE Benoit +## Last update Fri May 26 02:12:29 2006 SIGOURE Benoit ## include $(top_srcdir)/config/Transformers.mk @@ -39,7 +39,8 @@ PRISM-StartSymbols.def \ PRISM-Prefixed.def -SDFS = PRISM-Command.sdf \ +SDFS = \ + PRISM-Command.sdf \ PRISM-Constant.sdf \ PRISM-Declaration.sdf \ PRISM-Expression.sdf \ @@ -51,17 +52,20 @@ PRISM-Label.sdf \ PRISM-Layout.sdf \ PRISM-Literals.sdf \ + PRISM-Main.sdf \ + PRISM-MetaCongruences.sdf \ + PRISM-MetaVars.sdf \ PRISM-Module.sdf \ PRISM-ModulesFile.sdf \ PRISM-ModulesFileType.sdf \ PRISM-Reward.sdf \ + PRISM-StartSymbols.sdf \ PRISM-SystemComposition.sdf \ PRISM-Update.sdf \ - PRISM-Main.sdf \ PRISM.sdf \ - PRISM-StartSymbols.sdf + StrategoPRISM.sdf -EXTRA_DIST = $(wildcard *.sdf) +EXTRA_DIST = $(SDFS) PRISM.def: $(SDFS) PRISM-StartSymbols.def: $(SDFS) Index: tests/xrm/consts.xpm --- tests/xrm/consts.xpm (revision 0) +++ tests/xrm/consts.xpm (revision 0) @@ -0,0 +1,10 @@ +for i from 0 to 4 do + const int x[i] = 2*i; +end + +const int y[5]; +const z[5] = 42; +const double d[3] = 3.14; +rate c[4] = 42 > 3.14; +probe d[4]; +const bool b[3] = true; Index: tests/test-parse-xrm.sh.in --- tests/test-parse-xrm.sh.in (revision 35) +++ tests/test-parse-xrm.sh.in (working copy) @@ -16,6 +16,7 @@ for file in `find "@srcdir@" -name '*.pm' -o -name '*.nm' -o -name '*.sm' -o -name '*.xpm' | sort`; do echo @ECHO_N@ " Parsing `basename $file` ... " "@top_builddir@/src/tools/parse-xrm" -i "$file" -o /dev/null + rv=$? if [ $? -eq 0 ]; then echo 'OK, no ambiguities found' test_pass=$((test_pass + 1)) Index: TODO --- TODO (revision 35) +++ TODO (working copy) @@ -4,6 +4,9 @@ ## Misc. ## ## ----- ## + * Check why make distcheck fails because of autom4te.cache ?! + ./configure && make # runs configure twice!?? (probably related) + * PRISM's parser has a ForLoop node: Identifier "=" Expression ":" Expression [":" Expression] What the hell is this? @@ -22,6 +25,12 @@ const int y = x; Is it even possible to define a static const variable from another one? + * Improve the error messages using locations provided by addPosInfo when + they are available (xrm-front invoked with --add-pos|-P). + Some cases are very hard to handle for example array[N] where N is + static const int N = -1; will issue an error such as "undeclared meta + variable N" whereas the real problem is that array[N] couldn't be expanded. + ## ---------- ## ## Extensions ## ## ---------- ## @@ -62,8 +71,6 @@ x[1..3]?=0 => x_1=0 | x_2=0 | x_3=0 NOTE: x[5]?=0 should be considered as an error. - NOTE: arrays should behave like in C (array[N] is ranging from 0 to N-1) - I'm not sure it's really always handled this way ATM :/ * Add non-static array accesses (as suggested by Micha). For instance: module test

18 years, 7 months

XRM 35: Fix the size of generated arrays.

by SIGOURE Benoit

https://svn.lrde.epita.fr/svn/xrm/trunk Index: ChangeLog from SIGOURE Benoit <sigoure.benoit(a)lrde.epita.fr> Fix the size of generated arrays. * src/str/array-decl-desugar.str: Stick with the C-style array convention. (that is: array[N] has values ranging from array[0] to array[N-1]) array-decl-desugar.str | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) Index: src/str/array-decl-desugar.str --- src/str/array-decl-desugar.str (revision 34) +++ src/str/array-decl-desugar.str (working copy) @@ -45,13 +45,17 @@ /* find the first element in the list which matches ?Int(_) * eg: [Identifier("..."), Int("1"), Int("2")] will be transformed in * ([Identifier("...")], Int("1"), [Int("2")]) */ - ; <split-fetch-keep(?Int(_))> dims' => (dims-done, current-dim, dims-todo) + ; <split-fetch-keep(?Int(_))> dims' + => (dims-done, Int(current-dim), dims-todo) + + /* array[N] has N elements ranging from 0 to N-1 */ + ; <subtS>(current-dim, "1") => current-dim' /* replace the dimension we're working on by the meta-var */ ; <concat> [dims-done, [Identifier(x)], dims-todo] /* return the result in a tuple */ - ; !(x, current-dim, <id>) + ; !(x, Int(current-dim'), <id>) rules // FIXME: Try to figure out why concrete syntax fails to work here

18 years, 7 months

XRM 34: Use static const variables in constant propagation.

by SIGOURE Benoit

https://svn.lrde.epita.fr/svn/xrm/trunk Index: ChangeLog from SIGOURE Benoit <sigoure.benoit(a)lrde.epita.fr> Use static const variables in constant propagation. * src/sig/Makefile.am: Patch a possible dependency problem. * src/str/xrm-front.str: Change some comments. * src/str/xrm-to-prism.str: Collect static const variables. * src/str/prism-desugar.str: Use the known values of static const variables in constant propagation if possible. * TODO: Update things done. Add a question about PRISM's behavior. TODO | 13 +++++++++---- src/sig/Makefile.am | 8 +++++--- src/str/prism-desugar.str | 21 +++++++++++++++++++-- src/str/xrm-front.str | 6 +++--- src/str/xrm-to-prism.str | 45 +++++++++++++++++++++++++++++++++++++++++---- 5 files changed, 77 insertions(+), 16 deletions(-) Index: src/sig/Makefile.am --- src/sig/Makefile.am (revision 33) +++ src/sig/Makefile.am (working copy) @@ -5,7 +5,7 @@ ## Mail <sigoure.benoit(a)lrde.epita.fr> ## ## Started on Mon May 8 18:38:32 2006 SIGOURE Benoit -## Last update Tue May 9 20:39:39 2006 SIGOURE Benoit +## Last update Thu May 25 23:41:55 2006 SIGOURE Benoit ## include $(top_srcdir)/config/Transformers.mk @@ -18,8 +18,10 @@ SDF2RTG_FLAGS = --main $* -PRISM.def: +PRISM.def: $(top_builddir)/src/syn/prism/PRISM.def + rm -f $@ $(LN_S) $(top_builddir)/src/syn/prism/$@ $@ -XRM.def: +XRM.def: $(top_builddir)/src/syn/xrm/XRM.def + rm -f $@ $(LN_S) $(top_builddir)/src/syn/xrm/$@ $@ Index: src/str/xrm-front.str --- src/str/xrm-front.str (revision 33) +++ src/str/xrm-front.str (working copy) @@ -36,7 +36,7 @@ end end - // pipeline of transformations performed by xrm-front + /** pipeline of transformations performed by xrm-front */ xrm-front-pipeline = dbg(|"xrm-front-pipeline starting") ; xrm-to-prism @@ -47,14 +47,14 @@ end ; id // FIXME: add more transformations here - // list of available options for xrm-front + /** list of available options for xrm-front */ xrm-front-options = pp-aterm-option + add-pos-option + keep-attributes-option + desugar-option - // check the options are consistent + /** checks the options are consistent */ check-options = if <get-config> "-b" then // if we're asked for binary output, don't bother with pretty printing Index: src/str/xrm-to-prism.str --- src/str/xrm-to-prism.str (revision 33) +++ src/str/xrm-to-prism.str (working copy) @@ -1,6 +1,19 @@ /* ** This sub-module does the real work of the front-end. It transforms the ** program into a valid PRISM AST. +** +** Dynamic rules inventory: +** - DeclarationList: used by the strategy reorder-module-contents to +** store all the declarations within a given module. This way declarations +** can be grouped together in the module (as required by the PRISM grammar) +** - CommandList: used by the strategy reorder-module-contents to +** store all the commands within a given module. This way commands can +** be grouped together in the module (as required by the PRISM grammar) +** - ExpandStaticConsts: created by the strategy collect-static-const-decl +** and used by prism-desugar for constant propagation. Maps an identifier +** with a value and an annotated type. Only constants with a static value +** provided will be put here (constants can have their value defined in +** init blocks and chosen at random at runtime). */ module xrm-to-prism imports @@ -17,11 +30,15 @@ /* remove XRM sugar, normalize some nodes */ innermost(xrm-to-prism-desugar) - /* Desugar array declarations + /* Two things in one traversal: + * 1/ Desugar array declarations * eg: x[4][5] is transformed into two nested meta for loops * We can't do this in xrm-to-prism-desugar because the innermost - * traversal is bottomup and won't recurse into generated code */ - ; topdown(try(array-decl-desugar)) + * traversal is bottomup and won't recurse into generated code + * 2/ Collect static const variables + * Two goals: expand them if needed, look for variable name conflicts. + */ + ; topdown(try(array-decl-desugar); try(collect-static-const-decl)) /* Check that meta vars are always defined in the current scope when used * and that they are not redefined twice in the same scope */ @@ -48,7 +65,7 @@ xrm-to-prism-desugar: |[ e1 << e2 ]| -> |[ e1 * func(pow, 2, e2) ]| - // if the step is not specified, it is implicitely set to 1 + /** if the step is not specified, it is implicitly set to 1 */ xrm-to-prism-desugar: MetaFor(identifier, from, to, body) -> MetaFor(identifier, from, to, Int("1"), body) @@ -58,6 +75,26 @@ //|[ if e then s* end ]| -> |[ if e then s* else end ]| MetaIf(e, m*) -> MetaIf(e, m*, []) +signature constructors + Type : String -> Type + +strategies + + collect-static-const-decl = + ?ConstInt(idf, value) + ; where(!value{Type("int")} => v) + ; rules(ExpandStaticConsts: idf -> v) + + collect-static-const-decl = + ?ConstDouble(idf, value) + ; where(!value{Type("double")} => v) + ; rules(ExpandStaticConsts: idf -> v) + + collect-static-const-decl = + ?ConstBool(idf, value) + ; where(!value{Type("bool")} => v) + ; rules(ExpandStaticConsts: idf -> v) + strategies /** Index: src/str/prism-desugar.str --- src/str/prism-desugar.str (revision 33) +++ src/str/prism-desugar.str (working copy) @@ -9,13 +9,14 @@ ** 1. First convert all literal ints to doubles. This makes the ** simplifications easier to write since there is less cases to ** address (eg: int + int, int + double, double + int, - ** double + double etc.). + ** double + double etc.). This first pass works in a slightly + ** special way, see prism-desugar-first-pass for more info. ** 2. Desugar the AST ** 3. Convert the doubles which are round numbers back to ints. ** Simplify doubles (round them up and remove trailing zeros) */ prism-desugar = - topdown(try(IntToDouble)) + prism-desugar-first-pass ; innermost( RemoveUnconditionnalUpdates <+ AddZero <+ MulOne <+ MulZero <+ DivOne <+ catch-div-by-zero @@ -26,6 +27,22 @@ ) ; topdown(try(SimplifyDoubles <+ TruncateDouble)) + /** + ** Main goal: Transform all Int(_) -> Double(_) + ** In this first pass we also want to expand static consts. However, we + ** must be careful as to where these expansions occur. For instance, say + ** that N=10 (we know it thanks to the DR ExpandStaticConsts). If we are + ** on the node where N is declared (that is: |[ const int N = 10; ]|) we + ** should NOT expand `N' here. Otherwise we'll end up with + ** |[ const int 10 = 10; ]|. + */ + prism-desugar-first-pass = + ConstInt(id, prism-desugar) + <+ ConstDouble(id, prism-desugar) + <+ ConstBool(id, prism-desugar) + <+ ?Int(_); IntToDouble + <+ all(try(ExpandStaticConsts); prism-desugar-first-pass) + rules IntToDouble: Int(i) -> Double(i) Index: TODO --- TODO (revision 33) +++ TODO (working copy) @@ -17,6 +17,11 @@ * Add more tests. Add tests which actually do check that the generated code is correct (which is not done ATM). + * How are handled mutually recursive static constant variables in PRISM? + eg: const int x = y; + const int y = x; + Is it even possible to define a static const variable from another one? + ## ---------- ## ## Extensions ## ## ---------- ## @@ -91,10 +96,6 @@ x = 1..5,7,10..13 ==> (x>=1 & x<=5) | (x=7) | (x>=10 & x<=13) - * Evaluate constant calls to built-in functions, eg - func(min, 4, 5) - ==> 4 - * Expand formulas, eg formula lfree = p2=0..4,6,10; // ... @@ -159,3 +160,7 @@ [] x[0]=0 -> ... => ... <=> end endmodule => [] x_0=0 -> ... <=> [] x_0=0 -> ... => endmodule <=> endmodule + + * Evaluate constant calls to built-in functions, eg + func(min, 4, 5) + ==> 4

18 years, 7 months

XRM 33: Add constant propagation for builtins.

by SIGOURE Benoit

https://svn.lrde.epita.fr/svn/xrm/trunk Index: ChangeLog from SIGOURE Benoit <sigoure.benoit(a)lrde.epita.fr> Add constant propagation for builtins. Some C code was needed to implement easily and efficiently some operations on reals. The --pp-prism|-P option of xrm-front was removed and replaced by --add-pos|-P. The reason for this is that xrm-front takes PRISM code as input and was producing PRISM AST as output, which is a bit inconsistent. So the default is now to produce PRISM source code. addPosInfo is now only invoked with --add-pos|-P because it is very inefficient and introduces a big memory/time penalty. On big inputs it will even get killed by the system. * src/lib/xrm/Makefile.am: Remove useless include. * src/lib/Makefile.am: Ditto. * src/lib/prism/Makefile.am: Ditto. * src/syn/Makefile.am: Ditto. * src/lib/native: New. * src/lib/native/floor.c: New. * src/lib/native/libstr-reals.h: New. * src/lib/native/Makefile.am: New. * src/lib/native/ceil.c: New. * src/lib/native/power.c: New. * src/str/xrm-front.str: Change the -P option to be --add-pos. * src/str/Makefile.am: Use libstr-reals. * src/str/prism-desugar.str: Add builtins desugarisation. * src/str/reals.str: Add more new strategies using libstr-reals. * src/syn/prism/PRISM-MetaVars.sdf: Update the meta-var `a*'. * src/Makefile.am: Build the `lib' subdir before `str'. * tests/test-pp-prism.sh.in: Save the reason of the failing tests. * tests/test-xrm-front.sh.in: Ditto. * tests/test-parse-xrm.sh.in: Ditto. * tests/test-parse-prism.sh.in: Ditto. * tests/test-pp-xrm.sh.in: Ditto. * tests/xrm/desugar_builtins.pm: New. * configure.ac: Add src/lib/native/Makefile's generation. * bootstrap (svn:executable): Mark as executable. configure.ac | 3 +- src/Makefile.am | 4 +- src/lib/Makefile.am | 6 +--- src/lib/native/Makefile.am | 30 +++++++++++++++++++++ src/lib/native/ceil.c | 23 ++++++++++++++++ src/lib/native/floor.c | 22 +++++++++++++++ src/lib/native/libstr-reals.h | 41 +++++++++++++++++++++++++++++ src/lib/native/power.c | 37 ++++++++++++++++++++++++++ src/lib/prism/Makefile.am | 4 -- src/lib/xrm/Makefile.am | 4 -- src/str/Makefile.am | 9 ++++-- src/str/prism-desugar.str | 39 ++++++++++++++++++++++++++++ src/str/reals.str | 52 ++++++++++++++++++++++++++++++++++++- src/str/xrm-front.str | 54 ++++++++++++++++----------------------- src/syn/Makefile.am | 4 -- src/syn/prism/PRISM-MetaVars.sdf | 2 - tests/test-parse-prism.sh.in | 9 +++++- tests/test-parse-xrm.sh.in | 6 ++++ tests/test-pp-prism.sh.in | 12 +++++++- tests/test-pp-xrm.sh.in | 12 +++++++- tests/test-xrm-front.sh.in | 29 ++++++++++---------- tests/xrm/desugar_builtins.pm | 29 ++++++++++++++++++++ 22 files changed, 360 insertions(+), 71 deletions(-) Index: src/lib/xrm/Makefile.am --- src/lib/xrm/Makefile.am (revision 32) +++ src/lib/xrm/Makefile.am (working copy) @@ -5,9 +5,7 @@ ## Mail <sigoure.benoit(a)lrde.epita.fr> ## ## Started on Wed May 10 19:27:12 2006 SIGOURE Benoit -## Last update Fri May 12 05:20:11 2006 SIGOURE Benoit +## Last update Thu May 25 18:44:02 2006 SIGOURE Benoit ## -include $(top_srcdir)/config/toplevel.mk - SUBDIRS = pp Index: src/lib/native/floor.c --- src/lib/native/floor.c (revision 0) +++ src/lib/native/floor.c (revision 0) @@ -0,0 +1,22 @@ +/* +** floor.c for str-reals in /home/tsuna/work/xrm/trunk/src/lib/native +** +** Made by SIGOURE Benoit +** Mail <sigoure.benoit(a)lrde.epita.fr> +** +** Started on Thu May 25 16:32:59 2006 SIGOURE Benoit +** Last update Thu May 25 18:57:46 2006 SIGOURE Benoit +*/ + +#include <math.h> +#include "libstr-reals.h" + +ATerm STR_REALS_floor(ATerm t) +{ + double r; + + if(ATgetType(t) != AT_REAL && ATgetType(t) != AT_INT) + return NULL; + NUMERIC_ATERM_TO_REAL(r, t); + return (ATerm) ATmakeReal(floor(r)); +} Index: src/lib/native/libstr-reals.h --- src/lib/native/libstr-reals.h (revision 0) +++ src/lib/native/libstr-reals.h (revision 0) @@ -0,0 +1,41 @@ +/* +** libstr-reals.h for str-reals in /home/tsuna/work/xrm/trunk/src/lib/native +** +** Made by SIGOURE Benoit +** Mail <sigoure.benoit(a)lrde.epita.fr> +** +** Started on Thu May 25 16:32:27 2006 SIGOURE Benoit +** Last update Thu May 25 20:10:05 2006 SIGOURE Benoit +*/ + +#ifndef LIBSTR_REALS_H_ +# define LIBSTR_REALS_H_ + +# include <srts/stratego.h> + +/** +** Transform an ATerm which is either an AT_REAL or an AT_INT into a double. +** @param dst destination double (itself, not a pointer to it) +** @param term term to transform in double. +** @warning the caller MUST ensure that @a term is of type AT_REAL or AT_INT. +*/ +# define NUMERIC_ATERM_TO_REAL(dst, term) \ + do { \ + if(ATgetType(term) == AT_REAL) \ + { \ + dst = ATgetReal((ATermReal) term); \ + } \ + else /* (ATgetType(term) == AT_INT) */ \ + { \ + dst = ATgetInt((ATermInt) term); \ + } \ + } while(0) + +ATerm STR_REALS_ceil(ATerm t); +ATerm STR_REALS_floor(ATerm t); +ATerm STR_REALS_powi(ATerm base, ATerm power); +ATerm STR_REALS_powr(ATerm base, ATerm power); +ATerm STR_REALS_modi(ATerm lhs, ATerm rhs); +ATerm STR_REALS_modr(ATerm lhs, ATerm rhs); + +#endif /* !LIBSTR_REALS_H_ */ Index: src/lib/native/Makefile.am --- src/lib/native/Makefile.am (revision 0) +++ src/lib/native/Makefile.am (revision 0) @@ -0,0 +1,30 @@ +## +## Makefile.am for xrm in /home/tsuna/work/xrm/trunk/src/lib/native +## +## Made by SIGOURE Benoit +## Mail <sigoure.benoit(a)lrde.epita.fr> +## +## Started on Wed May 10 19:27:12 2006 SIGOURE Benoit +## Last update Thu May 25 20:19:00 2006 SIGOURE Benoit +## + +include $(top_srcdir)/config/toplevel.mk + +lib_LTLIBRARIES = libstr-reals.la +include_HEADERS = libstr-reals.h + +libstr_reals_la_SOURCES = $(include_HEADERS) \ + ceil.c \ + floor.c \ + power.c + +# FIXME: Detect in configure whether -lm needs to be used. +libstr_reals_la_LIBADD = $(SSL_LIBS) -lm + +BUILT_SOURCES = import-libstr-reals.c + +import-libstr-reals.c: Makefile + echo "/* code generated; used for strc --C-include \"'$@'\" */" > $@ + for f in $(libstr_reals_la_SOURCES); do \ + echo "#include \"$$f\"" >> $@; \ + done Index: src/lib/native/ceil.c --- src/lib/native/ceil.c (revision 0) +++ src/lib/native/ceil.c (revision 0) @@ -0,0 +1,23 @@ +/* +** ceil.c for str-reals in /home/tsuna/work/xrm/trunk/src/lib/native +** +** Made by SIGOURE Benoit +** Mail <sigoure.benoit(a)lrde.epita.fr> +** +** Started on Thu May 25 16:32:50 2006 SIGOURE Benoit +** Last update Thu May 25 19:19:48 2006 SIGOURE Benoit +*/ + +#include <math.h> +#include <stdio.h> +#include "libstr-reals.h" + +ATerm STR_REALS_ceil(ATerm t) +{ + double r; + + if(ATgetType(t) != AT_REAL && ATgetType(t) != AT_INT) + return NULL; + NUMERIC_ATERM_TO_REAL(r, t); + return (ATerm) ATmakeReal(ceil(r)); +} Index: src/lib/native/power.c --- src/lib/native/power.c (revision 0) +++ src/lib/native/power.c (revision 0) @@ -0,0 +1,37 @@ +/* +** power.c for str-reals in /home/tsuna/work/xrm/trunk/src/lib/native +** +** Made by SIGOURE Benoit +** Mail <sigoure.benoit(a)lrde.epita.fr> +** +** Started on Thu May 25 16:33:04 2006 SIGOURE Benoit +** Last update Thu May 25 20:07:23 2006 SIGOURE Benoit +*/ + +#include <math.h> +#include "libstr-reals.h" + +ATerm STR_REALS_powi(ATerm base, ATerm power) +{ + int ibase; + int ipower; + + if(ATgetType(base) != AT_INT || ATgetType(power) != AT_INT) + return NULL; + ibase = ATgetInt((ATermInt) base); + ipower = ATgetInt((ATermInt) power); + return (ATerm) ATmakeReal(pow(ibase, ipower)); +} + +ATerm STR_REALS_powr(ATerm base, ATerm power) +{ + double rbase; + double rpower; + + if((ATgetType(base) != AT_REAL && ATgetType(base) != AT_INT) || + (ATgetType(power) != AT_REAL && ATgetType(power) != AT_INT)) + return NULL; + NUMERIC_ATERM_TO_REAL(rbase, base); + NUMERIC_ATERM_TO_REAL(rpower, power); + return (ATerm) ATmakeReal(pow(rbase, rpower)); +} Index: src/lib/Makefile.am --- src/lib/Makefile.am (revision 32) +++ src/lib/Makefile.am (working copy) @@ -5,9 +5,7 @@ ## Mail <sigoure.benoit(a)lrde.epita.fr> ## ## Started on Wed May 10 19:27:12 2006 SIGOURE Benoit -## Last update Fri May 12 05:34:10 2006 SIGOURE Benoit +## Last update Thu May 25 18:55:45 2006 SIGOURE Benoit ## -include $(top_srcdir)/config/toplevel.mk - -SUBDIRS = prism xrm +SUBDIRS = prism xrm native Index: src/lib/prism/Makefile.am --- src/lib/prism/Makefile.am (revision 32) +++ src/lib/prism/Makefile.am (working copy) @@ -5,9 +5,7 @@ ## Mail <sigoure.benoit(a)lrde.epita.fr> ## ## Started on Wed May 10 19:27:12 2006 SIGOURE Benoit -## Last update Wed May 10 19:39:03 2006 SIGOURE Benoit +## Last update Thu May 25 18:43:55 2006 SIGOURE Benoit ## -include $(top_srcdir)/config/toplevel.mk - SUBDIRS = pp Index: src/str/xrm-front.str --- src/str/xrm-front.str (revision 32) +++ src/str/xrm-front.str (working copy) @@ -21,7 +21,7 @@ main-wrapped = check-options ; xtc-transform(!"parse-xrm", // parse input (returns a FILE) - !["-b", "--preserve-positions" | <pass-verbose>()]) + <concat>[ ["-b"], <pass-verbose>(), <pass-add-pos>() ]) ; read-from // read parsed input ; /*FIXME*/strip-annos // FIXME: remove this line!!!!!!!!!!!!!!!!!!!!!!!!!! ; xrm-front-pipeline // transformations @@ -29,14 +29,10 @@ ; if <get-config> "-b" then write-to // output binary ATerms else - if must-pp-prism then // output PRISM source - write-to; xtc-transform(!"pp-prism", pass-verbose) - else if must-pp-aterm then // output pp-ATerms write-to; xtc-transform(!"pp-aterm", pass-verbose) - else - write-to-text // output text ATerms - end + else // output PRISM source + write-to; xtc-transform(!"pp-prism", pass-verbose) end end @@ -53,8 +49,8 @@ // list of available options for xrm-front xrm-front-options = - pp-prism-option - + pp-aterm-option + pp-aterm-option + + add-pos-option + keep-attributes-option + desugar-option @@ -66,13 +62,6 @@ where(<set-pp-aterm> "no") ; warn-msg(|"Pretty printing cancelled: binary output requested.") end - - // it doesn't make sense: we're asked for binary output + PRISM output! - ; if must-pp-prism then - err-msg(|"Cannot generate binary output (-b) and PRISM output - (--pp-prism|-P) at the same time.") - ; <exit> 1 - end end strategies @@ -92,21 +81,6 @@ strategies - pp-prism-option = - Option("-P" + "--pp-prism" - , <set-pp-prism> "yes" - , !HelpString("-P | --pp-prism", "Convert output in PRISM source code - using pp-prism") - ) - - set-pp-prism = - <set-config> ("pp-prism", <id>) - - must-pp-prism = - <get-config> "pp-prism" => "yes" - -strategies - pp-aterm-option = Option("-A" + "--pp-aterm" , <set-pp-aterm> "yes" @@ -133,6 +107,24 @@ must-desugar = <get-config> "desugar" => "yes" +strategies + + add-pos-option = + Option("-P" + "--add-pos" + , <set-add-pos> "yes" + , !HelpString("-P | --add-pos", "When issuing error messages, tell the line + and column of the error. This is disabled by default as it + implies a big memory overhead if the input file is big.") + ) + + set-add-pos = + <set-config> ("add-pos", <id>) + + must-add-pos = + <get-config> "add-pos" => "yes" + + pass-add-pos = must-add-pos < !["--preserve-positions"] + ![] + /** * Documentation */ Index: src/str/Makefile.am --- src/str/Makefile.am (revision 32) +++ src/str/Makefile.am (working copy) @@ -5,19 +5,22 @@ ## Mail <sigoure.benoit(a)lrde.epita.fr> ## ## Started on Thu Apr 27 17:59:35 2006 SIGOURE Benoit -## Last update Thu May 25 17:27:20 2006 SIGOURE Benoit +## Last update Thu May 25 19:32:14 2006 SIGOURE Benoit ## include $(top_srcdir)/config/Transformers.mk -include $(wildcard *.dep) bin_PROGRAMS = xrm-front -xrm_SOURCES = xrm-front.c +xrm_front_SOURCES= xrm-front.c SCFLAGS = --main main-$* STRINCLUDES = -I $(srcdir) -I $(XTC)/share/xtc \ -I $(top_builddir)/src/sig \ - -I $(top_builddir)/src/syn/xrm + -I $(top_builddir)/src/syn/xrm \ + --C-include '"$(top_builddir)/src/lib/native/import-libstr-reals.c"' +AM_CFLAGS = -I$(top_srcdir)/src/lib/native + LDADD += $(SSL_LIBS) EXTRA_DIST = $(wildcard *.str) Index: src/str/prism-desugar.str --- src/str/prism-desugar.str (revision 32) +++ src/str/prism-desugar.str (working copy) @@ -22,6 +22,7 @@ <+ EvalPlus <+ EvalMinus <+ EvalMul <+ EvalDiv <+ EvalLt <+ EvalLtEq <+ EvalGt <+ EvalGtEq <+ EvalEq <+ EvalNeq <+ EvalAnd <+ EvalOr + <+ EvalMin <+ EvalMax <+ EvalFloor <+ EvalCeil <+ EvalPow <+ EvalMod ) ; topdown(try(SimplifyDoubles <+ TruncateDouble)) @@ -160,3 +161,41 @@ |[ false | true ]| -> |[ true ]| EvalOr: |[ false | false ]| -> |[ false ]| + +rules + + EvalMin: + |[ func(min, a*) ]| -> |[ r ]| + where !a*;debug + ; map(\ Double(d) -> d \);debug + ; minRL => r;debug + + EvalMax: + |[ func(max, a*) ]| -> |[ r ]| + where !a*;debug + ; map(\ Double(d) -> d \);debug + ; maxRL => r;debug + + EvalFloor: + |[ func(floor, d) ]| -> |[ r ]| where <floor>(d) => r + + EvalCeil: + |[ func(ceil, d) ]| -> |[ r ]| where <ceil>(d) => r + + EvalPow: + |[ func(pow, d1, d2) ]| -> |[ r ]| where <powR>(d1, d2) => r + + EvalMod: + |[ func(mod, d1, d2) ]| -> |[ r ]| + where !Double(d1) => ast_d1 + ; !Double(d2) => ast_d2 + /* ensure that d1 and d2 are in fact Int */ + ; <SimplifyDoubles> ast_d1 => Int(i) + ; <SimplifyDoubles> ast_d2 => Int(j) + ; if !j => "0" then + err-msg(|"Modulo by zero detected:") + ; debug + ; <xtc-exit> 3 + else + <modS> (i, j) => r + end Index: src/str/reals.str --- src/str/reals.str (revision 32) +++ src/str/reals.str (working copy) @@ -2,16 +2,64 @@ strategies - // for some reason the following rules are only defined for integers - // in the stratego-lib. Here is their equivalent for reals. + /* + ** for some reason the following rules are only defined for integers + ** in the stratego-lib. Here is their equivalent for reals. + */ + + maxr = gtr < Fst + Snd + minr = gtr < Snd + Fst + addR = (string-to-real, string-to-real); addr; real-to-string subtR = (string-to-real, string-to-real); subtr; real-to-string mulR = (string-to-real, string-to-real); mulr; real-to-string divR = (string-to-real, string-to-real); divr; real-to-string + gtR = where((string-to-real, string-to-real); gtr) geqR = where((string-to-real, string-to-real); ?(x,x) <+ gtr) ltR = where((string-to-real, string-to-real); not(?(x,x) <+ gtr)) leqR = where((string-to-real, string-to-real); not(gtr)) + maxR = where((string-to-real, string-to-real); maxr) + minR = where((string-to-real, string-to-real); minr) + + pow = powR <+ powI + + /** Let (x, y) be a tuple of reals, this strategy returns the value of x + ** raised to the power of y. + ** @type (String, String) -> String + */ + powR = (string-to-real, string-to-real); powr; real-to-string + + /** Let (x, y) be a tuple of integers, this strategy returns the value of x + ** raised to the power of y. + ** @warning the result may not be an integer (eg, if y is less than zero) + ** @type (String, String) -> String + */ + powS = (string-to-int, string-to-int); powi; real-to-string + + /** @type (Real, Real) -> Real */ + powr = ?(x, y); prim("STR_REALS_powr", x, y) + /** @type (Int, Int) -> Real */ + powi = ?(x, y); prim("STR_REALS_powi", x, y) + + ceil = string-to-real; prim("STR_REALS_ceil", <id>); real-to-string + floor = string-to-real; prim("STR_REALS_floor", <id>); real-to-string + + /** Find the min in a list of reals within strings + ** @type List(String) -> String + */ + minRL = + ?[h|t] + ; foldr(<string-to-real> h, minr, string-to-real) + ; real-to-string + + /** Find the max in a list of reals within strings + ** @type List(String) -> String + */ + maxRL = + ?[h|t] + ; foldr(<string-to-real> h, maxr, string-to-real) + ; real-to-string /** ** tests whether two reals are equal Index: src/syn/Makefile.am --- src/syn/Makefile.am (revision 32) +++ src/syn/Makefile.am (working copy) @@ -5,9 +5,7 @@ ## Mail <sigoure.benoit(a)lrde.epita.fr> ## ## Started on Thu Apr 27 17:40:41 2006 SIGOURE Benoit -## Last update Tue May 9 20:36:52 2006 SIGOURE Benoit +## Last update Thu May 25 18:44:17 2006 SIGOURE Benoit ## -include $(top_srcdir)/config/Transformers.mk - SUBDIRS = prism xrm Index: src/syn/prism/PRISM-MetaVars.sdf --- src/syn/prism/PRISM-MetaVars.sdf (revision 32) +++ src/syn/prism/PRISM-MetaVars.sdf (working copy) @@ -7,7 +7,7 @@ %% FIXME: The following doesn't work [xyzfgh][0-9]* "'" -> IdentifierPrime {prefer} [e][0-9]* -> Expression {prefer} - "a"[0-9]* "*" -> {Identifier ","}+ {prefer} + "a"[0-9]* "*" -> {Expression ","}+ {prefer} [m][0-9]* -> Module {prefer} "m"[0-9]* "*" -> Module+ {prefer} [c][0-9]* -> Command {prefer} Index: src/Makefile.am --- src/Makefile.am (revision 32) +++ src/Makefile.am (working copy) @@ -5,9 +5,9 @@ ## Mail <sigoure.benoit(a)lrde.epita.fr> ## ## Started on Thu Apr 27 16:57:03 2006 SIGOURE Benoit -## Last update Thu May 11 00:15:37 2006 SIGOURE Benoit +## Last update Thu May 25 19:05:24 2006 SIGOURE Benoit ## include $(top_srcdir)/config/toplevel.mk -SUBDIRS = syn sig str lib tools +SUBDIRS = syn sig lib str tools Index: tests/test-pp-prism.sh.in --- tests/test-pp-prism.sh.in (revision 32) +++ tests/test-pp-prism.sh.in (working copy) @@ -12,6 +12,7 @@ test_cnt=0 test_pass=0 target_dir='output-pp-prism' +rm -f failed_tests.$$ test ! -d $target_dir && { mkdir $target_dir \ || { echo "Cannot create $target_dir/ directory" && exit 1; } } @@ -31,6 +32,7 @@ "@top_builddir@/src/tools/parse-prism" -i "$file" -o "$outdir/$bfile.aterm" if [ $? -ne 0 ]; then echo 'FAILED, continuing with the next test...' + echo " * $file: parsing FAILED" >> failed_tests.$$ continue fi echo 'OK, no ambiguities found' @@ -40,6 +42,7 @@ -i "$outdir/$bfile.aterm" -o "$outdir/$bfile.pp.pm" if [ $? -ne 0 ]; then echo 'FAILED, continuing with the next test...' + echo " * $file: pretty printing FAILED" >> failed_tests.$$ continue fi echo 'OK' @@ -53,6 +56,7 @@ cat -n "$outdir/$bfile.pp.pm" echo '<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<' echo 'Now continuing with the next test...' + echo " * $file: re-parsing FAILED" >> failed_tests.$$ continue fi echo 'OK, no ambiguities found' @@ -62,6 +66,7 @@ -i "$outdir/$bfile.pp2aterm" -o "$outdir/$bfile.pp2.pm" if [ $? -ne 0 ]; then echo 'FAILED, continuing with the next test...' + echo " * $file: re-pretty printing FAILED" >> failed_tests.$$ continue fi echo 'OK' @@ -78,10 +83,14 @@ @STRATEGOXT@/bin/pp-aterm \ -i "$outdir/$bfile.pp2aterm" -o "$outdir/$bfile.pp2aterm.pp" diff -u "$outdir/$bfile.aterm.pp" "$outdir/$bfile.pp2aterm.pp" + echo " * $file: both parses did NOT produce the same AST" >> failed_tests.$$ + continue ;; *pp*) echo 'FAILED: the two pretty printing did NOT produce the same source:' diff -u "$outdir/$bfile.pp.pm" "$outdir/$bfile.pp2.pm" + echo " * $file: both pretty pretty did NIT produce the same source" >> failed_tests.$$ + continue ;; esac @@ -91,6 +100,7 @@ echo "$0: $test_pass/$test_cnt tests passed" echo "`date` $0: $test_pass/$test_cnt tests passed" >> test_summary -rm -rf "$outdir" +cat failed_tests.$$ >> test_summary +rm -rf failed_tests.$$ "$outdir" test $test_pass -eq $test_cnt Index: tests/xrm/desugar_builtins.pm --- tests/xrm/desugar_builtins.pm (revision 0) +++ tests/xrm/desugar_builtins.pm (revision 0) @@ -0,0 +1,29 @@ +module desugarme + x : [0..42]; + + // [] x=min(0) -> (x'=1); // invalid (must have at least 2 args) + [] x=func(min, 1, 2) -> (x'=0); + [] x=func(min, 4, 3, 5) -> (x'=1); + + // [] x=max(4) -> (x'=2); // invalid (must have at least 2 args) + [] x=func(max, 4, 5) -> (x'=3); + [] x=max(4, 5, 6) -> (x'=4); + + [] x=floor(41) -> (x'=5); + [] x=func(floor, 42.2) -> (x'=6); + // [] x=func(floor, 5, 6) -> (x'=7); // invalid (must have 1 arg) + + [] x=ceil(40) -> (x'=8); + [] x=func(ceil, 41.2) -> (x'=9); + // [] x=func(ceil, 5, 6) -> (x'=10); // invalid (must have 1 arg) + + // NOTE: there is no "short" version for pow, eg pow(2, 8) + // NOTE: short versions are "deprecated" + [] x=func(pow, 2, 8) -> (x'=11); + [] x=func(pow, 9.0, 0.5) -> (x'=12); + // [] x=func(pow, 5, 6, 7) -> (x'=13); // invalid (must have 2 args) + + [] x=func(mod, 1977, 100) -> (x'=14); + // [] x=func(mod, 42, 0) -> (x'=15); // invalid (modulo by 0) + // [] x=func(mod, 5, 6, 7) -> (x'=16); // invalid (must have 2 args) +endmodule Index: tests/test-xrm-front.sh.in --- tests/test-xrm-front.sh.in (revision 32) +++ tests/test-xrm-front.sh.in (working copy) @@ -12,6 +12,7 @@ test_cnt=0 test_pass=0 target_dir='output-xrm-front' +rm -f failed_tests.$$ test ! -d $target_dir && { mkdir $target_dir \ || { echo "Cannot create $target_dir/ directory" && exit 1; } } @@ -27,46 +28,43 @@ echo ">>> Starting the test for $basefile" test_cnt=$((test_cnt + 1)) - echo @ECHO_N@ " Converting $basefile into standard PRISM AST ... " - "@top_builddir@/src/str/xrm-front" \ + echo @ECHO_N@ " Converting $basefile into standard PRISM ... " + "@top_builddir@/src/str/xrm-front" -A \ -i "$file" -o "$outdir/$bfile.pm.aterm" if [ $? -ne 0 ]; then echo 'FAILED, continuing with the next test...' + echo " * $file: xrm-front failed (-A) FAILED" >> failed_tests.$$ continue fi echo 'OK' echo @ECHO_N@ " Converting $basefile into standard PRISM code ... " - "@top_builddir@/src/str/xrm-front" -P \ + "@top_builddir@/src/str/xrm-front" \ -i "$file" -o "$outdir/$bfile.pm" if [ $? -ne 0 ]; then echo 'FAILED, continuing with the next test...' + echo " * $file: xrm-front failed FAILED" >> failed_tests.$$ continue fi echo 'OK' echo @ECHO_N@ " Re-Parsing generated PRISM code for $basefile ... " - "@top_builddir@/src/tools/parse-prism" \ + "@top_builddir@/src/tools/parse-prism" -A \ -i "$outdir/$bfile.pm" -o "$outdir/$bfile.pm2.aterm" if [ $? -ne 0 ]; then echo 'FAILED, continuing with the next test...' + echo " * $file: re-parsing FAILED" >> failed_tests.$$ continue fi echo 'OK, no ambiguities found' - err='' - diff -q "$outdir/$bfile.pm.aterm" "$outdir/$bfile.pm2.aterm" || err='aterm' + diff -q "$outdir/$bfile.pm.aterm" "$outdir/$bfile.pm2.aterm" - case $err in - *aterm*) + if [ $? -ne 0 ]; then echo 'FAILED: the two parses did NOT produce the same AST:' - @STRATEGOXT@/bin/pp-aterm \ - -i "$outdir/$bfile.pm.aterm" -o "$outdir/$bfile.pm.aterm.pp" - @STRATEGOXT@/bin/pp-aterm \ - -i "$outdir/$bfile.pm2.aterm" -o "$outdir/$bfile.pm2.aterm.pp" + echo " * $file: both parses did NOT produce the same AST" >> failed_tests.$$ diff -u "$outdir/$bfile.pm.aterm.pp" "$outdir/$bfile.pm2.aterm.pp" - ;; - esac + fi echo "<<< Test for $basefile PASSED" test_pass=$((test_pass + 1)) @@ -74,6 +72,7 @@ echo "$0: $test_pass/$test_cnt tests passed" echo "`date` $0: $test_pass/$test_cnt tests passed" >> test_summary -rm -rf "$outdir" +cat failed_tests.$$ >> test_summary +rm -rf failed_tests.$$ "$outdir" test $test_pass -eq $test_cnt Index: tests/test-parse-xrm.sh.in --- tests/test-parse-xrm.sh.in (revision 32) +++ tests/test-parse-xrm.sh.in (working copy) @@ -11,16 +11,22 @@ test_cnt=0 test_pass=0 +rm -f failed_tests.$$ + for file in `find "@srcdir@" -name '*.pm' -o -name '*.nm' -o -name '*.sm' -o -name '*.xpm' | sort`; do echo @ECHO_N@ " Parsing `basename $file` ... " "@top_builddir@/src/tools/parse-xrm" -i "$file" -o /dev/null if [ $? -eq 0 ]; then echo 'OK, no ambiguities found' test_pass=$((test_pass + 1)) + else + echo " * $file: FAILED (bad return value: $rv)" >> failed_tests.$$ fi test_cnt=$((test_cnt + 1)) done echo "$0: $test_pass/$test_cnt tests passed" echo "`date` $0: $test_pass/$test_cnt tests passed" >> test_summary +cat failed_tests.$$ >> test_summary +rm -f failed_tests.$$ test $test_pass -eq $test_cnt Index: tests/test-parse-prism.sh.in --- tests/test-parse-prism.sh.in (revision 32) +++ tests/test-parse-prism.sh.in (working copy) @@ -11,16 +11,23 @@ test_cnt=0 test_pass=0 +rm -f failed_tests.$$ + for file in `find "@srcdir@" -name '*.pm' -o -name '*.nm' -o -name '*.sm' | sort`; do echo @ECHO_N@ " Parsing `basename $file` ... " "@top_builddir@/src/tools/parse-prism" -i "$file" -o /dev/null - if [ $? -eq 0 ]; then + rv=$? + if [ $rv -eq 0 ]; then echo 'OK, no ambiguities found' test_pass=$((test_pass + 1)) + else + echo " * $file: FAILED (bad return value: $rv)" >> failed_tests.$$ fi test_cnt=$((test_cnt + 1)) done echo "$0: $test_pass/$test_cnt tests passed" echo "`date` $0: $test_pass/$test_cnt tests passed" >> test_summary +cat failed_tests.$$ >> test_summary +rm -f failed_tests.$$ test $test_pass -eq $test_cnt Index: tests/test-pp-xrm.sh.in --- tests/test-pp-xrm.sh.in (revision 32) +++ tests/test-pp-xrm.sh.in (working copy) @@ -12,6 +12,7 @@ test_cnt=0 test_pass=0 target_dir='output-pp-xrm' +rm -f failed_tests.$$ test ! -d $target_dir && { mkdir $target_dir \ || { echo "Cannot create $target_dir/ directory" && exit 1; } } @@ -31,6 +32,7 @@ "@top_builddir@/src/tools/parse-xrm" -i "$file" -o "$outdir/$bfile.aterm" if [ $? -ne 0 ]; then echo 'FAILED, continuing with the next test...' + echo " * $file: parsing FAILED" >> failed_tests.$$ continue fi echo 'OK, no ambiguities found' @@ -40,6 +42,7 @@ -i "$outdir/$bfile.aterm" -o "$outdir/$bfile.pp.xpm" if [ $? -ne 0 ]; then echo 'FAILED, continuing with the next test...' + echo " * $file: pretty printing FAILED" >> failed_tests.$$ continue fi echo 'OK' @@ -53,6 +56,7 @@ cat -n "$outdir/$bfile.pp.xpm" echo '<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<' echo 'Now continuing with the next test...' + echo " * $file: re-parsing FAILED" >> failed_tests.$$ continue fi echo 'OK, no ambiguities found' @@ -62,6 +66,7 @@ -i "$outdir/$bfile.pp2aterm" -o "$outdir/$bfile.pp2.xpm" if [ $? -ne 0 ]; then echo 'FAILED, continuing with the next test...' + echo " * $file: re-pretty printing FAILED" >> failed_tests.$$ continue fi echo 'OK' @@ -78,10 +83,14 @@ @STRATEGOXT@/bin/pp-aterm \ -i "$outdir/$bfile.pp2aterm" -o "$outdir/$bfile.pp2aterm.pp" diff -u "$outdir/$bfile.aterm.pp" "$outdir/$bfile.pp2aterm.pp" + echo " * $file: both parses did NOT produce the same AST" >> failed_tests.$$ + continue ;; *pp*) echo 'FAILED: the two pretty printing did NOT produce the same source:' diff -u "$outdir/$bfile.pp.xpm" "$outdir/$bfile.pp2.xpm" + echo " * $file: both pretty pretty did NIT produce the same source" >> failed_tests.$$ + continue ;; esac @@ -91,6 +100,7 @@ echo "$0: $test_pass/$test_cnt tests passed" echo "`date` $0: $test_pass/$test_cnt tests passed" >> test_summary -rm -rf "$outdir" +cat failed_tests.$$ >> test_summary +rm -rf failed_tests.$$ "$outdir" test $test_pass -eq $test_cnt Index: configure.ac --- configure.ac (revision 32) +++ configure.ac (working copy) @@ -5,7 +5,7 @@ ## Mail <sigoure.benoit(a)lrde.epita.fr> ## ## Started on Thu Apr 27 15:55:56 2006 SIGOURE Benoit -## Last update Tue May 16 04:03:02 2006 SIGOURE Benoit +## Last update Thu May 25 18:56:02 2006 SIGOURE Benoit ## ## --------------- ## @@ -79,6 +79,7 @@ src/lib/prism/pp/Makefile src/lib/xrm/Makefile src/lib/xrm/pp/Makefile + src/lib/native/Makefile src/tools/Makefile tests/Makefile ]) Property changes on: bootstrap ___________________________________________________________________ Name: svn:executable + *

18 years, 7 months

XRM 32: Fix the Makefiles.

by SIGOURE Benoit

https://svn.lrde.epita.fr/svn/xrm/trunk Index: ChangeLog from SIGOURE Benoit <sigoure.benoit(a)lrde.epita.fr> Fix the Makefiles. * src/tools/Makefile.am: Fix the include of .dep files. * src/lib/xrm/pp/Makefile.am: Ditto. * src/lib/prism/pp/Makefile.am: Ditto. * src/str/Makefile.am: Ditto. * tests/Makefile.am: Don't need to include toplevel.mk. * src/syn/xrm/Makefile.am: Fix the include of .dep files + prevent make distclean from deleting the sources... hehe :| * src/syn/prism/Makefile.am: Ditto. src/lib/prism/pp/Makefile.am | 4 ++-- src/lib/xrm/pp/Makefile.am | 4 ++-- src/str/Makefile.am | 4 ++-- src/syn/prism/Makefile.am | 8 ++++---- src/syn/xrm/Makefile.am | 8 ++++---- src/tools/Makefile.am | 4 ++-- tests/Makefile.am | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) Index: src/tools/Makefile.am --- src/tools/Makefile.am (revision 31) +++ src/tools/Makefile.am (working copy) @@ -5,11 +5,11 @@ ## Mail <sigoure.benoit(a)lrde.epita.fr> ## ## Started on Mon May 8 21:16:56 2006 SIGOURE Benoit -## Last update Fri May 12 13:35:58 2006 SIGOURE Benoit +## Last update Thu May 25 17:28:02 2006 SIGOURE Benoit ## include $(top_srcdir)/config/Transformers.mk -include $(wildcard *.dep) +-include $(wildcard *.dep) bin_PROGRAMS = \ parse-prism \ Index: src/lib/xrm/pp/Makefile.am --- src/lib/xrm/pp/Makefile.am (revision 31) +++ src/lib/xrm/pp/Makefile.am (working copy) @@ -5,11 +5,11 @@ ## Mail <sigoure.benoit(a)lrde.epita.fr> ## ## Started on Wed May 10 19:27:12 2006 SIGOURE Benoit -## Last update Fri May 12 05:35:52 2006 SIGOURE Benoit +## Last update Thu May 25 17:27:04 2006 SIGOURE Benoit ## include $(top_srcdir)/config/toplevel.mk -include $(wildcard *.dep) +-include $(wildcard *.dep) pkgdata_DATA = xrm-parenthesize.str libexec_PROGRAMS = xrm-to-abox Index: src/lib/prism/pp/Makefile.am --- src/lib/prism/pp/Makefile.am (revision 31) +++ src/lib/prism/pp/Makefile.am (working copy) @@ -5,11 +5,11 @@ ## Mail <sigoure.benoit(a)lrde.epita.fr> ## ## Started on Wed May 10 19:27:12 2006 SIGOURE Benoit -## Last update Fri May 12 05:23:29 2006 SIGOURE Benoit +## Last update Thu May 25 17:26:51 2006 SIGOURE Benoit ## include $(top_srcdir)/config/toplevel.mk -include $(wildcard *.dep) +-include $(wildcard *.dep) pkgdata_DATA = prism-parenthesize.str libexec_PROGRAMS = prism-to-abox Index: src/str/Makefile.am --- src/str/Makefile.am (revision 31) +++ src/str/Makefile.am (working copy) @@ -5,11 +5,11 @@ ## Mail <sigoure.benoit(a)lrde.epita.fr> ## ## Started on Thu Apr 27 17:59:35 2006 SIGOURE Benoit -## Last update Thu May 18 16:49:50 2006 SIGOURE Benoit +## Last update Thu May 25 17:27:20 2006 SIGOURE Benoit ## include $(top_srcdir)/config/Transformers.mk -include $(wildcard *.dep) +-include $(wildcard *.dep) bin_PROGRAMS = xrm-front xrm_SOURCES = xrm-front.c Index: src/syn/xrm/Makefile.am --- src/syn/xrm/Makefile.am (revision 31) +++ src/syn/xrm/Makefile.am (working copy) @@ -5,11 +5,11 @@ ## Mail <sigoure.benoit(a)lrde.epita.fr> ## ## Started on Thu Apr 27 17:40:41 2006 SIGOURE Benoit -## Last update Thu May 18 16:53:05 2006 SIGOURE Benoit +## Last update Thu May 25 17:28:59 2006 SIGOURE Benoit ## include $(top_srcdir)/config/Transformers.mk -include $(wildcard *.dep) +-include $(wildcard *.dep) PGEN_FLAGS = -m $* SDF2RTG_FLAGS = -m $* @@ -38,8 +38,8 @@ CLEANFILES = $(pkgdata_DATA_built) \ $(wildcard *.dep) \ XRM.{c,str,c.dep} \ - XRM-StartSymbols.sdf \ - XRM-Prefixed.sdf + XRM-StartSymbols.def \ + XRM-Prefixed.def SDFS = XRM-Expression.sdf \ XRM-Main.sdf \ Index: src/syn/prism/Makefile.am --- src/syn/prism/Makefile.am (revision 31) +++ src/syn/prism/Makefile.am (working copy) @@ -5,11 +5,11 @@ ## Mail <sigoure.benoit(a)lrde.epita.fr> ## ## Started on Thu Apr 27 17:40:41 2006 SIGOURE Benoit -## Last update Thu May 18 16:52:52 2006 SIGOURE Benoit +## Last update Thu May 25 17:28:59 2006 SIGOURE Benoit ## include $(top_srcdir)/config/Transformers.mk -include $(wildcard *.dep) +-include $(wildcard *.dep) PGEN_FLAGS = -m $* SDF2RTG_FLAGS = -m $* @@ -36,8 +36,8 @@ CLEANFILES = $(pkgdata_DATA_built) \ $(wildcard *.dep) \ PRISM.{c,str,c.dep} \ - PRISM-StartSymbols.sdf \ - PRISM-Prefixed.sdf + PRISM-StartSymbols.def \ + PRISM-Prefixed.def SDFS = PRISM-Command.sdf \ PRISM-Constant.sdf \ Index: tests/Makefile.am --- tests/Makefile.am (revision 31) +++ tests/Makefile.am (working copy) @@ -5,10 +5,10 @@ ## Mail <sigoure.benoit(a)lrde.epita.fr> ## ## Started on Thu Apr 27 16:56:50 2006 SIGOURE Benoit -## Last update Tue May 16 04:04:35 2006 SIGOURE Benoit +## Last update Thu May 25 17:29:32 2006 SIGOURE Benoit ## -include $(top_srcdir)/config/toplevel.mk +#include $(top_srcdir)/config/toplevel.mk dist_check_SCRIPTS = \ test-parse-prism.sh \

18 years, 7 months

XRM 31: Add array declarations (sugar).

by SIGOURE Benoit

https://svn.lrde.epita.fr/svn/xrm/trunk Index: ChangeLog from SIGOURE Benoit <sigoure.benoit(a)lrde.epita.fr> Add array declarations (sugar). It is now possible to declare arrays such as: b[4][3] : bool; Multi-dimensional arrays are correctly handled. * src/str/array-decl-desugar.meta: New. * src/str/array-decl-desugar.str: New. * src/str/xrm-to-prism.str: Use array-decl-desugar. * src/syn/xrm/XRM-Command.sdf: "Dirty" hack to make it work. * tests/xrm/globals.xpm: New. * tests/xrm/array-decl_dim_exp.xpm: New. * tests/xrm/labels.xpm: New. * tests/xrm/array-decl_1d.xpm: New. * tests/xrm/array-decl_2d.xpm: New. * tests/xrm/array-decl_3d.xpm: New. * tests/prism/simple-label.pm: New. * TODO: Add many more ideas from Micha. TODO | 63 ++++++++++++++++++++++------ src/str/array-decl-desugar.meta | 1 src/str/array-decl-desugar.str | 87 +++++++++++++++++++++++++++++++++++++++ src/str/xrm-to-prism.str | 9 +++- src/syn/xrm/XRM-Command.sdf | 4 + tests/prism/simple-label.pm | 6 ++ tests/xrm/array-decl_1d.xpm | 8 +++ tests/xrm/array-decl_2d.xpm | 10 ++++ tests/xrm/array-decl_3d.xpm | 8 +++ tests/xrm/array-decl_dim_exp.xpm | 5 ++ tests/xrm/globals.xpm | 3 + tests/xrm/labels.xpm | 10 ++++ 12 files changed, 199 insertions(+), 15 deletions(-) Index: src/str/array-decl-desugar.meta --- src/str/array-decl-desugar.meta (revision 0) +++ src/str/array-decl-desugar.meta (revision 0) @@ -0,0 +1 @@ +Meta([Syntax("StrategoXRM")]) Index: src/str/array-decl-desugar.str --- src/str/array-decl-desugar.str (revision 0) +++ src/str/array-decl-desugar.str (revision 0) @@ -0,0 +1,87 @@ +/** +** This sub-module is used to desugar multi-dimension array declarations. +** Each dimension will by handled by a meta for loop unrolled later. +** So if we have a N-dimensions array declaration, it will be rewritten as +** N nested for loops. +** +** eg: x[4][3] : [1..2]; +** for meta_i_0 from 0 to 4 do +** for meta_i_1 from 0 to 3 do +** x[meta_i_0][meta_i_1] : [1..2]; +** end +** end +** Since this will unrolled and flattened later in by the submodule evaluating +** meta-code we will end up having all the x_i_j variables declared. +** +** NOTE: Each dimension is handled separately and recursion is not handled by +** array-decl-desugar. The rule must be called in a topdown(try(..)) in order +** to naturally traverse generated code and thus, handle all dimensions. +*/ +module array-decl-desugar + +strategies + + /** + ** Patch the list of dimensions with the meta-var used in the meta for loop. + ** Basically this strategy generates a new meta-var used as the iterator + ** in the meta-for loop and updates the dimensions of the declared array. + ** The dimension updated is the first one matching Int(_) + ** + ** eg: x[4][3] : bool; + ** => BoolDecNoInit(Identifier("x"), + ** ArrayAccess( [Identifier("meta_i_0"), Int(3)] )) + ** will needs to be transformed as: + ** BoolDecNoInit(Identifier("x"), + ** ArrayAccess( [Identifier("meta_i_0"), + ** Identifier("meta_i_1")] )) + ** @type List(dims) -> List(meta-var, current-dim, List(all-dims-patched)) + */ + update-dimensions(|dims) = + <newname> "__meta_i" => x + + /* Ensure that the list of dimensions is desugared */ + ; <prism-desugar> dims => dims' + + /* find the first element in the list which matches ?Int(_) + * eg: [Identifier("..."), Int("1"), Int("2")] will be transformed in + * ([Identifier("...")], Int("1"), [Int("2")]) */ + ; <split-fetch-keep(?Int(_))> dims' => (dims-done, current-dim, dims-todo) + + /* replace the dimension we're working on by the meta-var */ + ; <concat> [dims-done, [Identifier(x)], dims-todo] + + /* return the result in a tuple */ + ; !(x, current-dim, <id>) + +rules +// FIXME: Try to figure out why concrete syntax fails to work here + + array-decl-desugar: + IntDecNoInit(ArrayAccess(idf, dims), low, up) + //-> |[ for x from 0 to ~dim step 1 do x[i] : [~low..~up]; end ]| + -> MetaFor(Identifier(x), Int("0"), current-dim', Int("1"), + [ IntDecNoInit(ArrayAccess(idf, dims'), low, up) ]) + where update-dimensions(|dims) => (x, current-dim', dims') + + array-decl-desugar: + IntDec(ArrayAccess(idf, dims), low, up, value) + //-> |[ for x from 0 to ~dim step 1 do + // x[i] : [~low..~up] init ~value; + // end ]| + -> MetaFor(Identifier(x), Int("0"), current-dim', Int("1"), + [ IntDec(ArrayAccess(idf, dims'), low, up, value) ]) + where update-dimensions(|dims) => (x, current-dim', dims') + + array-decl-desugar: + BoolDecNoInit(ArrayAccess(idf, dims)) + //-> |[ for x from 0 to ~dim step 1 do x[i] : bool; end ]| + -> MetaFor(Identifier(x), Int("0"), current-dim', Int("1"), + [ BoolDecNoInit(ArrayAccess(idf, dims')) ]) + where update-dimensions(|dims) => (x, current-dim', dims') + + array-decl-desugar: + BoolDec(ArrayAccess(idf, dims), value) + //-> |[ for x from 0 to ~dim step 1 do x[i] : bool init ~value; end ]| + -> MetaFor(Identifier(x), Int("0"), current-dim', Int("1"), + [ BoolDec(ArrayAccess(idf, dims'), value) ]) + where update-dimensions(|dims) => (x, current-dim', dims') Index: src/str/xrm-to-prism.str --- src/str/xrm-to-prism.str (revision 30) +++ src/str/xrm-to-prism.str (working copy) @@ -9,12 +9,19 @@ desugar-array-accesses check-meta-vars eval-meta-code + array-decl-desugar strategies xrm-to-prism = /* remove XRM sugar, normalize some nodes */ - topdown(try(xrm-to-prism-desugar)) + innermost(xrm-to-prism-desugar) + + /* Desugar array declarations + * eg: x[4][5] is transformed into two nested meta for loops + * We can't do this in xrm-to-prism-desugar because the innermost + * traversal is bottomup and won't recurse into generated code */ + ; topdown(try(array-decl-desugar)) /* Check that meta vars are always defined in the current scope when used * and that they are not redefined twice in the same scope */ Index: src/syn/xrm/XRM-Command.sdf --- src/syn/xrm/XRM-Command.sdf (revision 30) +++ src/syn/xrm/XRM-Command.sdf (working copy) @@ -8,4 +8,6 @@ %% Command ::= "[" ArrayAccess "]" Expression "->" Updates ";" context-free syntax - "[" ArrayAccess "]" Expression "->" Updates ";" -> Command {cons("Command")} + "[" ArrayAccess? "]" Expression "->" Updates ";" + -> Command {prefer,cons("Command")} + %% FIXME: dirty hack: ^^^^^^ Index: tests/xrm/globals.xpm --- tests/xrm/globals.xpm (revision 0) +++ tests/xrm/globals.xpm (revision 0) @@ -0,0 +1,3 @@ +for i from 0 to 4 do + global x[i] : bool; +end Index: tests/xrm/array-decl_dim_exp.xpm --- tests/xrm/array-decl_dim_exp.xpm (revision 0) +++ tests/xrm/array-decl_dim_exp.xpm (revision 0) @@ -0,0 +1,5 @@ +// should be equivalent as declaring x[8] + +module arrays + x[4+4] : [0..42]; +endmodule Index: tests/xrm/labels.xpm --- tests/xrm/labels.xpm (revision 0) +++ tests/xrm/labels.xpm (revision 0) @@ -0,0 +1,10 @@ +probabilistic + +for i from 0 to 4 do + module dummy[i] + x[i] : [0..1] init i; + for j from 5 to 10 do + [testlabel[j]] x[i]=j -> x[i]'=j+1; + end + endmodule +end Index: tests/xrm/array-decl_1d.xpm --- tests/xrm/array-decl_1d.xpm (revision 0) +++ tests/xrm/array-decl_1d.xpm (revision 0) @@ -0,0 +1,8 @@ +// should be expanded in x_0 x_1 x_2 x_3 + +module arrays + x[4] : [0..42]; + y[4] : [0..42] init 0; + b[4] : bool; + c[4] : bool init true; +endmodule Index: tests/xrm/array-decl_2d.xpm --- tests/xrm/array-decl_2d.xpm (revision 0) +++ tests/xrm/array-decl_2d.xpm (revision 0) @@ -0,0 +1,10 @@ +// should be expanded in x_0_0 x_1_0 x_2_0 x_3_0 +// x_0_1 x_1_1 x_2_1 x_3_1 +// x_0_2 x_1_2 x_2_2 x_3_2 + +module arrays + x[4][3] : [0..42]; + y[4][3] : [0..42] init 0; + b[4][3] : bool; + c[4][3] : bool init true; +endmodule Index: tests/xrm/array-decl_3d.xpm --- tests/xrm/array-decl_3d.xpm (revision 0) +++ tests/xrm/array-decl_3d.xpm (revision 0) @@ -0,0 +1,8 @@ +// should be expanded in x_0_0_0 x_0_0_1 x_0_0_2 x_0_0_3 ... + +module arrays + x[4][3][2] : [0..42]; + y[4][3][2] : [0..42] init 0; + b[4][3][2] : bool; + c[4][3][2] : bool init true; +endmodule Index: tests/prism/simple-label.pm --- tests/prism/simple-label.pm (revision 0) +++ tests/prism/simple-label.pm (revision 0) @@ -0,0 +1,6 @@ +probabilistic + +module dummy + x: [0..1] init 1; + [label] x=2 -> x'=3; +endmodule Index: TODO --- TODO (revision 30) +++ TODO (working copy) @@ -14,25 +14,30 @@ * Write some sort of formal descriptions of the extensions offered. + * Add more tests. Add tests which actually do check that the generated code + is correct (which is not done ATM). + ## ---------- ## ## Extensions ## ## ---------- ## * Add the following at the meta-level: - Let's have the possibility to generate other ModulesFileSection such as: - o Formula - o Constant - o Global - o RenamedModule - o SystemComp - o RewardStruct - - * Add arrays (sugar). module varArrays <=> module varArrays - module varArrays => x_0 : [0..3]; <=> for a_0 from 0 to 4 do - x[4] : [0..3]; => x_1 : [0..3]; <=> x[i] : [0..3]; - [] x[0]=0 -> ... => ... <=> end - endmodule => [] x_0=0 -> ... <=> [] x_0=0 -> ... - => endmodule <=> endmodule + o Formula // add it in the grammar. should be + // automagically handled + o Constant // ditto + o Global // done (automagically handled) + o RenamedModule // need to be investigated + o RewardStruct // ditto + o SystemComp // b0rken anyway + + * Add a sanity check before check-meta-vars to collect all statically + declared variables (globals, formulas, local declarations etc.) and ensure + (in check-meta-vars) that their identifiers are unique. + Keep the (static) constant globals somewhere in order to allow + prism-desugar to take these values into account (which will automagically + allow things such as x[N] to declare an array for instance, where N is a + global const) * 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. @@ -52,6 +57,31 @@ x[1..3]?=0 => x_1=0 | x_2=0 | x_3=0 NOTE: x[5]?=0 should be considered as an error. + NOTE: arrays should behave like in C (array[N] is ranging from 0 to N-1) + I'm not sure it's really always handled this way ATM :/ + + * Add non-static array accesses (as suggested by Micha). For instance: + module test + x[4] : [0..5]; + i : [0..2]; + + [] x[0..i]=0 -> ... // i can't be guessed at compile time + endmodule + + Translate this with something like: + module test + x_0 : [0..5]; + x_1 : [0..5]; + x_2 : [0..5]; + x_3 : [0..5]; + i : [0..3]; + + [] x_0=0 & ((i<1 | x_1=0) & (i<2 | x_2=0) & (i<3 | x_3=0)) -> ... + endmodule + + /!\ This (might) require that we add another pass to collect the generated + variables and their type + domain and might be quite challenging to + handle. ## -------------- ## ## Desugarisation ## @@ -122,3 +152,10 @@ - In between modules (that is, where we can expect a ModulesFileSection) - In between commands (that is where we can expect a Declaration or a Command) + + * Add arrays (sugar). module varArrays <=> module varArrays + module varArrays => x_0 : [0..3]; <=> for a_0 from 0 to 4 do + x[4] : [0..3]; => x_1 : [0..3]; <=> x[a_0] : [0..3]; + [] x[0]=0 -> ... => ... <=> end + endmodule => [] x_0=0 -> ... <=> [] x_0=0 -> ... + => endmodule <=> endmodule

18 years, 7 months

havm 168: Close all opened file handles before leaving.

by Roland Levillain

https://svn.lrde.epita.fr/svn/havm/trunk Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Close all opened file handles before leaving. * src/Main.hs (closeHandle): New function. (evalM): Use it to close all opened file handles. Main.hs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) Index: src/Main.hs --- src/Main.hs (revision 167) +++ src/Main.hs (working copy) @@ -101,7 +101,14 @@ storeHandle ph else return () +-- Close a (maybe) file handle. +closeHandle :: Maybe Handle -> Mnd () +closeHandle mh = + case mh of + Just h -> lift $ hClose h + Nothing -> return () +-- Evaluate the program. evalM :: Map String OptVal -> [Stm Ann] -> Mnd () evalM fm stms = do optset "low" $ findWithDefault (BVal False) "low" fm @@ -121,10 +128,9 @@ trace ["evaling"] evalExp $ Call NoAnn (Name NoAnn "main") [] profileM - mph <- getProfileHandle - case mph of - Just ph -> lift $ hClose ph - Nothing -> return () + getProfileHandle >>= closeHandle + getDisplayHandle >>= closeHandle + getTraceHandle >>= closeHandle main :: IO () main =

18 years, 7 months

Des échecs de la build farm

by Akim Demaille

Certains échecs de la build farm (pour Vaucanson) tiennent à son utilisation des sources qui est incorrecte et qui ne repose sur aucun des modèles connus. On a deux modèles, et seulement deux : - mainteneur, et donc accès svn - utilisateur, et donc une tarball Actuellement, on fait un checkout qu'on copie ailleurs. C'est bâtard, et en particulier mon code qui fait des checkouts à ce moment-là (et c'est légitime) meurt à l'exécution. Il faut choisir, mais seuls deux modèles existent : - mainteneur, et on part d'un svn checkout - utilisateur, et on part d'un make dist Je vote pour le premier cas, qui comprend le second grâce à distcheck.

18 years, 7 months

Re: XRM 30: Correct some typos and add things to do.

by michael.cadilhac＠lrde.org

SIGOURE Benoit <sigoure.benoit(a)lrde.epita.fr> writes: > + * Add arrays (sugar). module varArrays <=> module varArrays > + module varArrays => x_0 : [0..3]; <=> for a_0 from 0 to 4 do > + x[4] : [0..3]; => x_1 : [0..3]; <=> x[i] : [0..3]; > + [] x[0]=0 -> ... => ... <=> end > + endmodule => [] x_0=0 -> ... <=> [] x_0=0 -> ... > + => endmodule <=> endmodule Wow, et ça ne va pas conflicter avec tes boucles for sur les modules ? Si tu comptes te servir du fait que ce soit un identifiant, rappel toi bien que static const i = 3; x[i] c'est joliement évalué à la compil comme un tableau de 3 éléments pour toi. Qui plus est, il faudra faire attention au masquage de i par une variable de boucle. > + * Add conditional tests on arrays (with support for ranges): > + x[5]=0 => x_5=0 > + x[1..3]=0 => x_1=0 & x_2=0 & x_3=0 > + (support things such as: x[1..3,6,8..9]) > + > + x[1..3]?=0 => x_1=0 | x_2=0 | x_3=0 > + > + NOTE: x[5]?=0 should be considered as an error. NOTE: Je ne vois pas pourquoi. Si j'ai une variable j dans mon module, j'aimerai pouvoir écrire x[1..j] = 0, ce qui se traduirait par (j < 1 || x_1 = 0) && (j < 2 || x_2 = 0) && ... Ce qui pourrait conduire à écrire non seulement x[1..1], mais aussi x[1..0]. Ajoute à ça que mon `j' peut-être connu (static const) à la compilation, donc il ne faudra pas faire cela. -- | Le copillage-collage Michaël `Micha' Cadilhac | | tue le programmeur. cadilh_m - Epita 2007 - CSI | | -- Dictons LRDE JID: micha(a)amessage.be | `-- - - - - --'

18 years, 7 months

XRM 30: Correct some typos and add things to do.

by SIGOURE Benoit

https://svn.lrde.epita.fr/svn/xrm/trunk Index: ChangeLog from SIGOURE Benoit <sigoure.benoit(a)lrde.epita.fr> Correct some typos and add things to do. * src/str/prism-desugar.str: Correct a typo (thanks vimspell). * src/str/eval-meta-code.str: Ditto. * src/syn/prism/PRISM-Command.sdf: Ditto. * src/syn/xrm/XRM-Command.sdf: New. Seems to be broken. * src/syn/xrm/XRM-Main.sdf: Import XRM-Command. * TODO: Add a couple of nice ideas suggested by Michael Cadilhac. Update things done. TODO | 90 +++++++++++++++++++++++++--------------- src/str/eval-meta-code.str | 2 src/str/prism-desugar.str | 2 src/syn/prism/PRISM-Command.sdf | 2 src/syn/xrm/XRM-Command.sdf | 11 ++++ src/syn/xrm/XRM-Main.sdf | 1 6 files changed, 72 insertions(+), 36 deletions(-) Index: src/str/prism-desugar.str --- src/str/prism-desugar.str (revision 29) +++ src/str/prism-desugar.str (working copy) @@ -48,7 +48,7 @@ rules /** - ** Remove conditionnal updates. + ** Remove conditional updates. ** [] guard -> unconditionnal-update-list; ** is rewritten as: ** [] guard -> 1:(unconditionnal-update-list); Index: src/str/eval-meta-code.str --- src/str/eval-meta-code.str (revision 29) +++ src/str/eval-meta-code.str (working copy) @@ -37,7 +37,7 @@ <eval-meta-code> else-part else ice(|"eval-meta-code", <concat-strings> [ - "the conditionnal test of a meta if could ", + "the conditional test of a meta if could ", "not be reduced to a single value (True or", " False), this should have been detected ", "earlier"], Index: src/syn/xrm/XRM-Command.sdf --- src/syn/xrm/XRM-Command.sdf (revision 0) +++ src/syn/xrm/XRM-Command.sdf (revision 0) @@ -0,0 +1,11 @@ +module XRM-Command +imports + PRISM-to-XRM + +exports + + %% EBNF Grammar: Extended Commands + %% Command ::= "[" ArrayAccess "]" Expression "->" Updates ";" + + context-free syntax + "[" ArrayAccess "]" Expression "->" Updates ";" -> Command {cons("Command")} Index: src/syn/xrm/XRM-Main.sdf --- src/syn/xrm/XRM-Main.sdf (revision 29) +++ src/syn/xrm/XRM-Main.sdf (working copy) @@ -8,3 +8,4 @@ XRM-Literals XRM-Declaration XRM-Update + XRM-Command Index: src/syn/prism/PRISM-Command.sdf --- src/syn/prism/PRISM-Command.sdf (revision 29) +++ src/syn/prism/PRISM-Command.sdf (working copy) @@ -14,7 +14,7 @@ context-free syntax "[" Identifier? "]" Expression "->" Updates ";" -> Command {cons("Command")} - %% The follwing syntax was commented out in PRISM's parser... + %% The following syntax was commented out in PRISM's parser... %% It seems it will be used in the near future when rewards will be fully %% supported. Index: TODO --- TODO (revision 29) +++ TODO (working copy) @@ -14,35 +14,11 @@ * Write some sort of formal descriptions of the extensions offered. - * Fix the Int nodes in the static for loops (if its really necessary?) - ## ---------- ## ## Extensions ## ## ---------- ## - * Add static for loops and static if: - for i from 0 to 3 step 1 do => module sensor_0 - module sensor[i] => b_0 : [0..42] init 0; - b[i] : [0..42] init 0; => s_0_0 : [0..2] init 2; - for j from 0 to 3 do => s_0_1 : [0..4] init 2; - if j = 1 then => s_0_2 : [0..4] init 2; - s[i][j] : [0..j+3] init 2; => s_0_2 : [0..4] init 2; - else => - s[i][j] : [0..j+2] init 2; => [] s_0_0=0 -> (b_0'=b_0+1) - end => [] s_0_1=0 -> (b_0'=b_0+1) - end => [] s_0_2=0 -> (b_0'=b_0+1) - => endmodule - for j from 0 to 3 do => - [] s[i][j]=0 -> (b[i]' = b[i]+1) => module sensor_1 - end => b_1 : [0..42] init 1; - endmodule => s_1_0 : [0..2] init 2; - end => ... - - Of course, the for loops must be unroll-able statically. - Static for loops can be found: - - In between modules (that is, where we can expect a ModulesFileSection) - - In between commands (that is where we can expect a Declaration or a - Command) + * Add the following at the meta-level: - Let's have the possibility to generate other ModulesFileSection such as: o Formula o Constant @@ -50,15 +26,32 @@ o RenamedModule o SystemComp o RewardStruct - Notice: it's not necessary for Init since it seems only one Init - section is allowed. - I think it doesn't make sense to allow static if-then-else constructs - outside static for loops because, ATM, static for loops are the only way - to introduce static (meta-)variables (such as `i' and `j' in the previous - example). - Note: Issue a warning (or an error?) if we generate twice the same module - name. + * Add arrays (sugar). module varArrays <=> module varArrays + module varArrays => x_0 : [0..3]; <=> for a_0 from 0 to 4 do + x[4] : [0..3]; => x_1 : [0..3]; <=> x[i] : [0..3]; + [] x[0]=0 -> ... => ... <=> end + endmodule => [] x_0=0 -> ... <=> [] x_0=0 -> ... + => endmodule <=> endmodule + + * 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. + + * Add bound checking. (extension of the previous point) + Dirty way: check that each variable is declared somewhere. + Hard way: detect and register array declarations and detect the bounds of + the array. When array expansion occurs, check that we're not + out of bounds. This can get very tricky since a variable can be + expanded BEFORE its actual declaration (especially in XRM). + + * Add conditional tests on arrays (with support for ranges): + x[5]=0 => x_5=0 + x[1..3]=0 => x_1=0 & x_2=0 & x_3=0 + (support things such as: x[1..3,6,8..9]) + + x[1..3]?=0 => x_1=0 | x_2=0 | x_3=0 + + NOTE: x[5]?=0 should be considered as an error. ## -------------- ## ## Desugarisation ## @@ -98,3 +91,34 @@ // ... [] x=3 -> ... // x=3 is impossible [] x=0 -> (x'=3) // x=3 is not in the definition range of x + + ## ---- ## + ## DONE ## + ## ---- ## + + The following work has been done but is kept here because it contains some + useful informations to be reused in the final documentation of the package. + + * Meta for loops and meta if statements: + for i from 0 to 3 step 1 do => module sensor_0 + module sensor[i] => b_0 : [0..42] init 0; + b[i] : [0..42] init 0; => s_0_0 : [0..2] init 2; + for j from 0 to 3 do => s_0_1 : [0..4] init 2; + if j = 1 then => s_0_2 : [0..4] init 2; + s[i][j] : [0..j+3] init 2; => s_0_2 : [0..4] init 2; + else => + s[i][j] : [0..j+2] init 2; => [] s_0_0=0 -> (b_0'=b_0+1) + end => [] s_0_1=0 -> (b_0'=b_0+1) + end => [] s_0_2=0 -> (b_0'=b_0+1) + => endmodule + for j from 0 to 3 do => + [] s[i][j]=0 -> (b[i]' = b[i]+1) => module sensor_1 + end => b_1 : [0..42] init 1; + endmodule => s_1_0 : [0..2] init 2; + end => ... + + Of course, the for loops must be unroll-able statically. + Meta for loops can be found: + - In between modules (that is, where we can expect a ModulesFileSection) + - In between commands (that is where we can expect a Declaration or a + Command)

18 years, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Projects