Behavioral #56

mantkiew · 2014-11-18T20:29:04Z

Behavioral Clafer

…mporal expressions, transitions and modalities.

…ng of some expressions; Added simple test runner 'desugartests.sh' in test/positive/

…lla for all top level clafer relations. Changed time binding in constraints.

…encodings

irModuleTrace is always recomputed fixes in Desugarer and Html generator

Pass GenEnv instead of ClaferArgs around removed ClaferArgs from GenCtx

… fixed group cardinality constraint

--> next step (X) -->> many steps (U)

…, html rendering of temp modifiers, root clafer initial and final,

(fixed non-exhaustive patterns)

…s reserved All test suite models now compile

…avioral

…oral

…oral # Resolved Conflicts: # src/Language/Clafer/Generator/Choco.hs # src/Language/Clafer/Intermediate/ResolverName.hs # src/Language/Clafer/Intermediate/StringAnalyzer.hs # stack.yaml

Release 0.4.5

…t ClaferIG can distinguish

…ise cabal install does not work

juodaspaulius and others added 27 commits October 27, 2014 22:03

Added temporal language elements to grammar

afa098b

Integrated behavioral clafer grammar and implemented desugaring of te…

60f9ccf

…mporal expressions, transitions and modalities.

Adjusted grammar; Finished implemented desugaring rules; Fixed sugari…

be09529

…ng of some expressions; Added simple test runner 'desugartests.sh' in test/positive/

Implemented Alloy-Ltl model code generator

682ba9d

Refreshed grammar generated code and added missing files to clafer.cabal

25fd327

AlloyLtl generator: fixed mutable clafer cardinalities

f744a38

Improvments in AlloyLtl generator: created root clafer which is umbre…

8b025a7

…lla for all top level clafer relations. Changed time binding in constraints.

Updated gramamr with new pattern expressions and updated pattern ltl …

ea2db1f

…encodings

updated with gsdlab/clafer/develop

cd8aa73

updated with gsdlab/develop: added uidIClaferMap

9fc0fdf

irModuleTrace is always recomputed fixes in Desugarer and Html generator

removed duplicate clafer names from test cases

4eba463

ClaferBinding = Maybe UID

d65d1e7

Pass GenEnv instead of ClaferArgs around removed ClaferArgs from GenCtx

merged ClaferBinding from gsdlab/develop

6ec67a0

merged from gsdlab/develop

a097a93

change soft constraint from (...) to assert [...]

7d97821

Merged from upstream/develop

5d3053f

Added lonce temporal pattern

04e8cce

Fixed parent constraint; fixed first local time instance declaration;…

7a8333f

… fixed group cardinality constraint

inheritance of mutability

9d691bb

merged _parentUID, isTop fix, ** instead of & from develop

7dccee0

regen parser

19a4628

fixed syntax of transitions/removed async transition

67c7df4

--> next step (X) -->> many steps (U)

removed FinalConstraint, added IClaferModifiers and their inheritance…

b7216c4

…, html rendering of temp modifiers, root clafer initial and final,

fixed warnings

4e6fd8f

fixed test cases using set intersection (& to **)

68ebb3f

fixed changing & to **

a430fec

initial and final inherited correctly (were "flipped")

bc900fc

mantkiew self-assigned this Jan 5, 2015

mantkiew added 2 commits January 5, 2015 09:51

added the missing rules to HTML generator

a657c18

(fixed non-exhaustive patterns)

html rendering of transition on clafer decl and the remaining patterns

8a2bff1

mantkiew and others added 27 commits May 11, 2016 13:16

fixed grammar for min, max, and if/then/else. Fixed a test case 'X' i…

b7237a7

…s reserved All test suite models now compile

updated test case 'objectivesMinMax' - 'X' is a reserved keyword

8c8e909

Ensure that instance occurs at least once as child of parent instance

6277e9b

Merge branch 'behavioral' of github.com:juodaspaulius/clafer into beh…

8b00e8b

…avioral

only produce Choco output for static subset

8317599

add test cases

6fd0d9f

Merge remote-tracking branch 'refs/remotes/gsdlab/master'

4f85b6b

Merge remote-tracking branch 'refs/remotes/origin/master' into behavi…

a3e51c6

…oral

Merge remote-tracking branch 'upstream/master'

3b86d0d

Merge remote-tracking branch 'refs/remotes/origin/master' into behavi…

a85ffa3

…oral # Resolved Conflicts: # src/Language/Clafer/Generator/Choco.hs # src/Language/Clafer/Intermediate/ResolverName.hs # src/Language/Clafer/Intermediate/StringAnalyzer.hs # stack.yaml

Merge branch 'develop' of https://github.com/gsdlab/clafer into develop

fa22651

merged gsdlab/develop, resolved conflicts

a2c8f6b

Merge pull request gsdlab#91 from gsdlab/develop

cd625bc

Release 0.4.5

Merge remote-tracking branch 'gsdlab/master'

98fb546

updated with gsdlab/master, resolved conflicts in stack.yaml

e8dad77

Merge remote-tracking branch 'origin/master' into behavioral

992ad59

fixed test/experimental/tmp_PowerWindowDesignModel.cfr

12b2c0a

commented out or removed failing temporal assertions

cea13bc

added temporal regressions for reference

cc04fad

fix to be , and to be

920cc47

warning cleanup, missing pattern matches, linting

43d9152

updated regressions

e5ebe23

styling of temporal keywords, updated regressions

c65c5ed

compile temporal models to .tmp.als, and static models to .als so tha…

4a6d7f9

…t ClaferIG can distinguish

save .tmp.als files as .als for backwards compatibility

40ecf67

Release 0.5.0

143ed0b

add stateTrace.als to datafiles so that it's present in sdist. Otherw…

2615517

…ise cabal install does not work

mantkiew removed the Do not merge label Mar 14, 2017

mantkiew merged commit 44ee340 into gsdlab:develop Mar 14, 2017

mantkiew deleted the behavioral branch March 14, 2017 03:55

Behavioral #56

Behavioral #56

Conversation

mantkiew commented Nov 18, 2014 • edited

mantkiew commented Nov 18, 2014 •

edited