Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 0.3.3.14-8-2013 #35

Merged
merged 176 commits into from Aug 15, 2013
Merged

Release 0.3.3.14-8-2013 #35

merged 176 commits into from Aug 15, 2013

Commits on May 7, 2013

  1. Added test cases to test/positive/grammar.

    @ezulkosk
    ezulkosk committed May 7, 2013
    Copy the full SHA
    7852857 View commit details
    Browse the repository at this point in the history

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

    @ezulkosk
    ezulkosk committed May 7, 2013
    Copy the full SHA
    b9ec3ba View commit details
    Browse the repository at this point in the history

Commits on May 13, 2013

  1. test cases for issues i227 and i228

    @mantkiew
    mantkiew committed May 13, 2013
    Copy the full SHA
    a76006e View commit details
    Browse the repository at this point in the history

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

    @mantkiew
    mantkiew committed May 13, 2013
    Copy the full SHA
    2b5286e View commit details
    Browse the repository at this point in the history

Commits on May 23, 2013

  1. Added String to Int Map into the compilerResults 

    Edited StringAnalyzer.hs to return a writer contain the string to int
map it used.
Edited Clafer.hs to add this map to the compiler results
    @Luke-Michael-Brown
    Luke-Michael-Brown committed May 23, 2013
    Copy the full SHA
    affc046 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2013

  1. Made the type message consistent.

    @JLiangWaterloo
    JLiangWaterloo committed May 28, 2013
    Copy the full SHA
    5020b3b View commit details
    Browse the repository at this point in the history

Commits on May 29, 2013

  1. removed Writer monad

    @mantkiew
    mantkiew committed May 29, 2013
    Copy the full SHA
    8ffe65d View commit details
    Browse the repository at this point in the history

  2. [i232] http://gsd.uwaterloo.ca:8888/question/964/scope-options 

    copied SimpleScopeAnalyzer.hs which is the previous ScopeAnalyzer.hs
    @mantkiew
    mantkiew committed May 29, 2013
    Copy the full SHA
    0fa68f4 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2013

  1. bumped version to 0.3.3 

    updated versions of libraries for platform 2012.4.0.0
    @mantkiew
    mantkiew committed May 30, 2013
    Copy the full SHA
    b58b833 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into develop

    @mantkiew
    mantkiew committed May 30, 2013
    Copy the full SHA
    888c744 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into strMap

    @mantkiew
    mantkiew committed May 30, 2013
    Copy the full SHA
    29b03d2 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2013

  1. Fixed 'If-Then-Else' type.

    U-AlexMur-PC\AlexMur committed Jun 2, 2013
    Copy the full SHA
    62644db View commit details
    Browse the repository at this point in the history

  2. Revert "Fixed 'If-Then-Else' type." 

    This reverts commit 62644db.
    Alexander Murashkin committed Jun 2, 2013
    Copy the full SHA
    bd8d2a9 View commit details
    Browse the repository at this point in the history

  3. Fixed 'If-Then-Else' type resolution.

    Alexander Murashkin committed Jun 2, 2013
    Copy the full SHA
    0707b5f View commit details
    Browse the repository at this point in the history

  4. Updated the 'If-Then-Else' fix.

    Alexander Murashkin committed Jun 2, 2013
    Copy the full SHA
    a39f41e View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2013

  1. Added test infrastructure

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 3, 2013
    Copy the full SHA
    f6db895 View commit details
    Browse the repository at this point in the history

  2. Added test infrastructure

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 3, 2013
    Copy the full SHA
    0b878d1 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2013

  1. Merged from develop

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 4, 2013
    Copy the full SHA
    abd968d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #20 from gsdlab/strMap 

    [232] Scope Options and [220] display string values
    @JLiangWaterloo
    JLiangWaterloo committed Jun 4, 2013
    Copy the full SHA
    85ec00f View commit details
    Browse the repository at this point in the history

  3. removed a binary

    @mantkiew
    mantkiew committed Jun 4, 2013
    Copy the full SHA
    ecf3943 View commit details
    Browse the repository at this point in the history

  4. removed temp file

    @mantkiew
    mantkiew committed Jun 4, 2013
    Copy the full SHA
    7b15ea9 View commit details
    Browse the repository at this point in the history

  5. Added test case to check that all clafers in test/positive compile

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 4, 2013
    Copy the full SHA
    b095abb View commit details
    Browse the repository at this point in the history

  6. Updated cabal for testing

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 4, 2013
    Copy the full SHA
    30e6a50 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2013

  1. fixed make prof to work with cabal properly

    @mantkiew
    mantkiew committed Jun 5, 2013
    Copy the full SHA
    e58f3f6 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2013

  1. Fixed issue in test case where files could not have '.' in name as we… 

    …ll as also reading ".dst.cfr" files
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 6, 2013
    Copy the full SHA
    b302337 View commit details
    Browse the repository at this point in the history

  2. Added display of clafer values that fail and their error message in t… 

    …he test case
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 6, 2013
    Copy the full SHA
    ff93217 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2013

  1. Cleaned up compile test case

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 7, 2013
    Copy the full SHA
    804149a View commit details
    Browse the repository at this point in the history

  2. More clean up on test-suite.hs

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 7, 2013
    Copy the full SHA
    47e953f View commit details
    Browse the repository at this point in the history

  3. Fixed small type declarations bug from previous commit and tidied up

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 7, 2013
    Copy the full SHA
    ec47e4f View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2013

  1. Fixed typo in test clafer in positive

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 10, 2013
    Copy the full SHA
    caa154b View commit details
    Browse the repository at this point in the history

  2. Fixed small typo in test-suite.hs

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 10, 2013
    Copy the full SHA
    e8cba04 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2013

  1. Fixed for issue i92 with refrences to clafers not integers 

    http://gsd.uwaterloo.ca:8888/question/440/incorrect-initialization-of-multiple
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 13, 2013
    Copy the full SHA
    64d62be View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2013

  1. Changed the infrastructure for how the claferArgs are set up

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 14, 2013
    Copy the full SHA
    1b72d6f View commit details
    Browse the repository at this point in the history

  2. added comments and examples to IR datatypes

    @mantkiew
    mantkiew committed Jun 14, 2013
    Copy the full SHA
    8a55351 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #21 from gsdlab/i92 

    Fix for issue i92 with refrences to clafers (not addressing the parsing issue with integers)
    @mantkiew
    mantkiew committed Jun 14, 2013
    Copy the full SHA
    0453702 View commit details
    Browse the repository at this point in the history

  4. Improved performance.

    @JLiangWaterloo
    JLiangWaterloo committed Jun 14, 2013
    Copy the full SHA
    4d9fb75 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2013

  1. Fixed parentof, refto, colonto.

    @JLiangWaterloo
    JLiangWaterloo committed Jun 16, 2013
    Copy the full SHA
    d5889de View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2013

  1. Fixed i235, in this situation treat '->' as ':'

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 17, 2013
    Copy the full SHA
    74fc7a2 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2013

  1. Fixed i226 

    http://gsd.uwaterloo.ca:8888/question/948/unary-minus-generated-incorrectly-for-alloy42
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 20, 2013
    Copy the full SHA
    72415bb View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2013

  1. Fixed warnings for Front

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 25, 2013
    Copy the full SHA
    c0434c6 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2013

  1. stop copying the executable to root dir. new version after merging pu… 

    …ll reg i92
    @mantkiew
    mantkiew committed Jun 26, 2013
    Copy the full SHA
    558163d View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2013

  1. Fixed i235 for ss=simple, ignore prev commit 

    http://gsd.uwaterloo.ca:8888/question/976/error-in-alloy-generator-maybefromjust-nothing
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 27, 2013
    Copy the full SHA
    f4a37a2 View commit details
    Browse the repository at this point in the history

  2. Fixed merge issues

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 27, 2013
    Copy the full SHA
    ded6175 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into i226

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 27, 2013
    Copy the full SHA
    5736d71 View commit details
    Browse the repository at this point in the history

  4. Fixed i74 

    http://gsd.uwaterloo.ca:8888/question/338/problem-with-translation-of-abstract-clafers-in?answer=1004#answer-container-1004
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 27, 2013
    Copy the full SHA
    7d3ab40 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2013

  1. Fixed i188 

    http://gsd.uwaterloo.ca:8888/question/803/integer-values-that-repeat-disappear
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 28, 2013
    Copy the full SHA
    a7d4766 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into i236

    @mantkiew
    mantkiew committed Jun 28, 2013
    Copy the full SHA
    dbf783a View commit details
    Browse the repository at this point in the history

  3. Fixed i199 

    http://gsd.uwaterloo.ca:8888/question/867/add-attributed-feature-models-check
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 28, 2013
    Copy the full SHA
    93d4ead View commit details
    Browse the repository at this point in the history

  4. Merge pull request #22 from gsdlab/i236 

    I236
    @mantkiew
    mantkiew committed Jun 28, 2013
    Copy the full SHA
    b3db52c View commit details
    Browse the repository at this point in the history

  5. fixed merge conflict from develop

    @mantkiew
    mantkiew committed Jun 28, 2013
    Copy the full SHA
    2040790 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #24 from gsdlab/i235 

    I235
    @mantkiew
    mantkiew committed Jun 28, 2013
    Copy the full SHA
    9735196 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into i74

    @mantkiew
    mantkiew committed Jun 28, 2013
    Copy the full SHA
    f099d4c View commit details
    Browse the repository at this point in the history

  8. test case from i74

    @mantkiew
    mantkiew committed Jun 28, 2013
    Copy the full SHA
    0439e88 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2013

  1. Fixed mismatching child and parent.

    @JLiangWaterloo
    JLiangWaterloo committed Jun 29, 2013
    Copy the full SHA
    2ce0cd7 View commit details
    Browse the repository at this point in the history

  2. Fixed for the model 

    x ->> integer
y ->> integer
z -> integer = sum (x ++ y)

Where "sum (x ++ y)" did not compile.
    @JLiangWaterloo
    JLiangWaterloo committed Jun 29, 2013
    Copy the full SHA
    e44ccfd View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2013

  1. Fixed test case 'case_refrence_Unused_Absstract_Clafer'

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 2, 2013
    Copy the full SHA
    0a08866 View commit details
    Browse the repository at this point in the history

  2. merged with develop

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 2, 2013
    Copy the full SHA
    0d2ddac View commit details
    Browse the repository at this point in the history

  3. Added testcase for i239

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 2, 2013
    Copy the full SHA
    d513a9f View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2013

  1. Added fold and map to traverse the IR

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 4, 2013
    Copy the full SHA
    a35e8c6 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2013

  1. Merge from develop

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 5, 2013
    Copy the full SHA
    2c28ab9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into i226

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 5, 2013
    Copy the full SHA
    8c40452 View commit details
    Browse the repository at this point in the history

  3. Moved Ir traverse functions into IntClafer

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 5, 2013
    Copy the full SHA
    6e7637d View commit details
    Browse the repository at this point in the history

  4. removed unnecessary exports

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 5, 2013
    Copy the full SHA
    e1b5df3 View commit details
    Browse the repository at this point in the history

  5. Cleaned up implementation

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 5, 2013
    Copy the full SHA
    84abe08 View commit details
    Browse the repository at this point in the history

  6. Fixed small bugs from previous commit

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 5, 2013
    Copy the full SHA
    c9bf3eb View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2013

  1. refined a test case and added another one for i188

    @mantkiew
    mantkiew committed Jul 6, 2013
    Copy the full SHA
    61061b4 View commit details
    Browse the repository at this point in the history

  2. added a test case for i226

    @mantkiew
    mantkiew committed Jul 6, 2013
    Copy the full SHA
    8ff1975 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #25 from gsdlab/i226 

    Fixed i226
    @mantkiew
    mantkiew committed Jul 6, 2013
    Copy the full SHA
    9f6e21e View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2013

  1. Removed extra test file and switch order for (-1) when given an unary… 

    … minus
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 8, 2013
    Copy the full SHA
    7ee1e20 View commit details
    Browse the repository at this point in the history

  2. Fixed bug where afm-check did not check for '*', added test file, and… 

    … cleaned up implementation
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 8, 2013
    Copy the full SHA
    d555c58 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into i199

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 8, 2013
    Copy the full SHA
    7e79967 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into i188

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 8, 2013
    Copy the full SHA
    cd2e617 View commit details
    Browse the repository at this point in the history

  5. Made foldMapIR consistent with iFoldMap

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 8, 2013
    Copy the full SHA
    0f0a707 View commit details
    Browse the repository at this point in the history

  6. Fixed issue from previous commit

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 8, 2013
    Copy the full SHA
    3ef6c1d View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2013

  1. Merge pull request #28 from gsdlab/i199 

    I199
    @JLiangWaterloo
    JLiangWaterloo committed Jul 9, 2013
    Copy the full SHA
    a9dbfc8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #27 from gsdlab/i188 

    Fixed i188
    @JLiangWaterloo
    JLiangWaterloo committed Jul 9, 2013
    Copy the full SHA
    4f35bd4 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #26 from gsdlab/i74 

    I74
    @JLiangWaterloo
    JLiangWaterloo committed Jul 9, 2013
    Copy the full SHA
    b7a4f0d View commit details
    Browse the repository at this point in the history

  4. Type check http://gsd.uwaterloo.ca:8888/question/985/quantify-over-in… 

    …teger.
    @JLiangWaterloo
    JLiangWaterloo committed Jul 9, 2013
    Copy the full SHA
    cfcda6c View commit details
    Browse the repository at this point in the history

  5. Added Empty Cardinality Test Case

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 9, 2013
    Copy the full SHA
    34bd324 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2013

  1. Fixed bug in foldIR not working properly

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 10, 2013
    Copy the full SHA
    4ea88ea View commit details
    Browse the repository at this point in the history

  2. test case for i205

    @mantkiew
    mantkiew committed Jul 10, 2013
    Copy the full SHA
    2607cf3 View commit details
    Browse the repository at this point in the history

  3. new version, updated package versions in cabal, using cabal >= 1.16, … 

    …updated README (versions, help), added lacking GLPK libs to build in Makefile, added test cases
    @mantkiew
    mantkiew committed Jul 10, 2013
    Copy the full SHA
    ec5a5e6 View commit details
    Browse the repository at this point in the history

  4. Rearranged test files to proper location

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 10, 2013
    Copy the full SHA
    9e638b0 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2013

  1. Rearranged test files and updated make test, and test-suite.hs

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 11, 2013
    Copy the full SHA
    3a75973 View commit details
    Browse the repository at this point in the history

  2. Changed how the Test Infrastructure is Structured to report clearer f… 

    …ail messages

Also rearranged some of the test files removing duplicates and moving
non fixed files into a separate fail folder
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 11, 2013
    Copy the full SHA
    ee5d02b View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2013

  1. fixed test case for i101 so that it's possible to get instances

    @mantkiew
    mantkiew committed Jul 12, 2013
    Copy the full SHA
    ffe8369 View commit details
    Browse the repository at this point in the history

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

    @mantkiew
    mantkiew committed Jul 12, 2013
    Copy the full SHA
    de4e24a View commit details
    Browse the repository at this point in the history

  3. moved tests from src and library to test and test suite. reconfigured… 

    … cabal
    @mantkiew
    mantkiew committed Jul 12, 2013
    Copy the full SHA
    33907a2 View commit details
    Browse the repository at this point in the history

  4. modified a test case for i78 so that it can be instantiated

    @mantkiew
    mantkiew committed Jul 12, 2013
    Copy the full SHA
    c9d28ad View commit details
    Browse the repository at this point in the history

  5. modified a test case for i95 so that it can be instantiated

    @mantkiew
    mantkiew committed Jul 12, 2013
    Copy the full SHA
    58052ec View commit details
    Browse the repository at this point in the history

  6. Moved i237 to IG

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 12, 2013
    Copy the full SHA
    55a8514 View commit details
    Browse the repository at this point in the history

  7. fixed a test case for i84 so that it can be instantiated. added '.ref's

    @mantkiew
    mantkiew committed Jul 12, 2013
    Copy the full SHA
    8307d6b View commit details
    Browse the repository at this point in the history

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

    @mantkiew
    mantkiew committed Jul 12, 2013
    Copy the full SHA
    a38cd0d View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2013

  1. Changed the layout Resolver to give safer errors 

    This required making the layout resolver monadic
Also made a few other error's safer throughout the compiler
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 16, 2013
    Copy the full SHA
    3417051 View commit details
    Browse the repository at this point in the history

  2. Fixed i161/i150 

    Changed rule:
if group cardinality is 0..*, all children have default card of 1.1
if group cardinality is not 0..* all children have default card of 0..1
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 16, 2013
    Copy the full SHA
    65a23bb View commit details
    Browse the repository at this point in the history

  3. Merge pull request #29 from gsdlab/i61/i150 

    Fixed i161/i150
    @mantkiew
    mantkiew committed Jul 16, 2013
    Copy the full SHA
    d09daf8 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2013

  1. merged from develop

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 17, 2013
    Copy the full SHA
    a853098 View commit details
    Browse the repository at this point in the history

  2. Fixed warnings for Generator

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 17, 2013
    Copy the full SHA
    a9f717c View commit details
    Browse the repository at this point in the history

  3. Fixed Warnings for Optimizer

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 17, 2013
    Copy the full SHA
    c7eac42 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2013

  1. Fix for http://gsd.uwaterloo.ca:8888/question/1043/unintuitive-typing… 

    …-for-unions
    @JLiangWaterloo
    JLiangWaterloo committed Jul 18, 2013
    Copy the full SHA
    48e1dd9 View commit details
    Browse the repository at this point in the history

  2. Fixed Warnings for Intermediate 

    Still a couple to fix up in GLPKScopeAnalyzer will do later
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 18, 2013
    Copy the full SHA
    847a2aa View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2013

  1. Update ecore2clafer.jar

    @redmagic4
    redmagic4 committed Jul 19, 2013
    Copy the full SHA
    d225427 View commit details
    Browse the repository at this point in the history

  2. Fixed Warnings for Main files and Test Files

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 19, 2013
    Copy the full SHA
    c46ab74 View commit details
    Browse the repository at this point in the history

  3. Merged from Develop and other small fixes

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 19, 2013
    Copy the full SHA
    dc53e96 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #31 from redmagic4/develop 

    Update ecore2clafer.jar
    @mantkiew
    mantkiew committed Jul 19, 2013
    Copy the full SHA
    c56d051 View commit details
    Browse the repository at this point in the history

  5. Other last fixes

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 19, 2013
    Copy the full SHA
    38367ae View commit details
    Browse the repository at this point in the history

  6. Changed how voidf warning was fixed

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 19, 2013
    Copy the full SHA
    a001586 View commit details
    Browse the repository at this point in the history

  7. fixed so that regression testing works

    @mantkiew
    mantkiew committed Jul 19, 2013
    Copy the full SHA
    5d2c8aa View commit details
    Browse the repository at this point in the history

  8. fixed how make test works 

    Just do
1) make clean
2) make
3) make test
make install is no longer necessary
    @mantkiew
    mantkiew committed Jul 19, 2013
    Copy the full SHA
    4ca21ec View commit details
    Browse the repository at this point in the history

  9. merge from develop

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 19, 2013
    Copy the full SHA
    06645e2 View commit details
    Browse the repository at this point in the history

  10. Fixed bug in the alloy generator where wrong alloy code was generated 

    Also fixes testCase not passing
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 19, 2013
    Copy the full SHA
    709a75d View commit details
    Browse the repository at this point in the history

  11. moved grammar tests to negative/grammar and failing/grammar

    @mantkiew
    mantkiew committed Jul 19, 2013
    Copy the full SHA
    591748e View commit details
    Browse the repository at this point in the history

  12. validation now prints input file name instead of tooldir

    @mantkiew
    mantkiew committed Jul 19, 2013
    Copy the full SHA
    867f148 View commit details
    Browse the repository at this point in the history

  13. always --keep-unused

    @mantkiew
    mantkiew committed Jul 19, 2013
    Copy the full SHA
    94fffae View commit details
    Browse the repository at this point in the history

  14. disabled clafer self testing

    @mantkiew
    mantkiew committed Jul 19, 2013
    Copy the full SHA
    d1d0685 View commit details
    Browse the repository at this point in the history

  15. checking for "des.cfr" 

    fixed a typo
    @mantkiew
    mantkiew committed Jul 19, 2013
    Copy the full SHA
    036bf3d View commit details
    Browse the repository at this point in the history

  16. updated regression tests

    @mantkiew
    mantkiew committed Jul 19, 2013
    Copy the full SHA
    3ba39f5 View commit details
    Browse the repository at this point in the history

  17. updated versions 

    GHC 7.6.3
Platform 2013.2.0.0
    @mantkiew
    mantkiew committed Jul 19, 2013
    Copy the full SHA
    fcfd327 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2013

  1. work towards fix

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 22, 2013
    Copy the full SHA
    9981ec9 View commit details
    Browse the repository at this point in the history

  2. Merged develop into warning fixes

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 22, 2013
    Copy the full SHA
    581c712 View commit details
    Browse the repository at this point in the history

  3. Fixed the rest of the warnings from GLPK

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 22, 2013
    Copy the full SHA
    2924294 View commit details
    Browse the repository at this point in the history

  4. Fixed typo from previous commit

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 22, 2013
    Copy the full SHA
    4886661 View commit details
    Browse the repository at this point in the history

  5. Fixed a bug where the OPTIONS command no longer worked 

    This will caused by the change in how the Arg's work when removing the
Maybe's
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 22, 2013
    Copy the full SHA
    292942e View commit details
    Browse the repository at this point in the history

  6. Fixed a bug from feature model check 

    This should never happen so there should be no change
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 22, 2013
    Copy the full SHA
    3f30606 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2013

  1. Fixed a bug where not all noSpan PExp's were an empty pid

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 23, 2013
    Copy the full SHA
    9f1de1b View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2013

  1. Fixed merge issues

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 24, 2013
    Copy the full SHA
    80f76c9 View commit details
    Browse the repository at this point in the history

  2. moved all grammar test into test/grammar

    @mantkiew
    mantkiew committed Jul 24, 2013
    Copy the full SHA
    6f3b9fb View commit details
    Browse the repository at this point in the history

  3. renamed i131 test file 

    cannot have ( ) in filename
    @mantkiew
    mantkiew committed Jul 24, 2013
    Copy the full SHA
    0d85fb7 View commit details
    Browse the repository at this point in the history

  4. removed .als and .xml files from test/positive

    @mantkiew
    mantkiew committed Jul 24, 2013
    Copy the full SHA
    20940ff View commit details
    Browse the repository at this point in the history

  5. fixed showing error msg in make test

    @mantkiew
    mantkiew committed Jul 24, 2013
    Copy the full SHA
    6edc5dc View commit details
    Browse the repository at this point in the history

  6. fixed removal of .xml 

    renamed .xml in experimental so that it does not get removed
    @mantkiew
    mantkiew committed Jul 24, 2013
    Copy the full SHA
    32501d6 View commit details
    Browse the repository at this point in the history

  7. removed redundant Make clean in test/positive

    @mantkiew
    mantkiew committed Jul 24, 2013
    Copy the full SHA
    9b67b08 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' into WarningFixes

    @mantkiew
    mantkiew committed Jul 24, 2013
    Copy the full SHA
    73e55c2 View commit details
    Browse the repository at this point in the history

  9. fixed the missing cardinality constraint bug 

    cardinality was computed for the parent instead of the child, which is
why for

a n..m
b

b always had cardinality n..m
    @mantkiew
    mantkiew committed Jul 24, 2013
    Copy the full SHA
    398d811 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2013

  1. Fix for http://gsd.uwaterloo.ca:8888/question/1043/unintuitive-typing… 

    …-for-unions
    @JLiangWaterloo
    JLiangWaterloo committed Jul 25, 2013
    Copy the full SHA
    431b66b View commit details
    Browse the repository at this point in the history

  2. fixed missing EnumNames 

    This was fixed by removing a previous commit that attempted to make all
PExp's with noSpan have an empty pid but it had a side effect, effecting
Enum's
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 25, 2013
    Copy the full SHA
    7fc9661 View commit details
    Browse the repository at this point in the history

  3. Merged develop into WarningFixes

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 25, 2013
    Copy the full SHA
    b3070d6 View commit details
    Browse the repository at this point in the history

  4. initialization with multiple is positive for clafers and failing for … 

    …integers

split the test case into positive/failing
    @mantkiew
    mantkiew committed Jul 25, 2013
    Copy the full SHA
    8b5c782 View commit details
    Browse the repository at this point in the history

  5. moved test cases from grammar/failing/grammar to grammar/failing

    @mantkiew
    mantkiew committed Jul 25, 2013
    Copy the full SHA
    e1d483c View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2013

  1. Added Example test suite from SandBox

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 26, 2013
    Copy the full SHA
    1e55ada View commit details
    Browse the repository at this point in the history

  2. Fixed bug where non abstract top level clafers defaulted to 0..1 rath… 

    …er than 1..1

Also fixed some errors in the test-suite from the previous commit
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 26, 2013
    Copy the full SHA
    52d708b View commit details
    Browse the repository at this point in the history

  3. updated reqressions after "generate one instead of lone fix"

    @mantkiew
    mantkiew committed Jul 26, 2013
    Copy the full SHA
    b05211f View commit details
    Browse the repository at this point in the history

  4. Changed the desugarer to generated 1..1 cardinalities for enum's rath… 

    …er than empty
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 26, 2013
    Copy the full SHA
    ae97727 View commit details
    Browse the repository at this point in the history

  5. fixed: for enums type, should be no card. 1..1 only for enum literals 

    updated regression
    @mantkiew
    mantkiew committed Jul 26, 2013
    Copy the full SHA
    b270b7b View commit details
    Browse the repository at this point in the history

  6. saved regressions for 0.3.2 and 0.3.3 + 0.3.3 vs 0.3.2 diff on positive 

    everything as expected
    @mantkiew
    mantkiew committed Jul 26, 2013
    Copy the full SHA
    5c9ac40 View commit details
    Browse the repository at this point in the history

  7. moved the diff and new version

    @mantkiew
    mantkiew committed Jul 26, 2013
    Copy the full SHA
    5acfc1e View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2013

  1. Fixed a bug in ecore2clafer.jar related with claferKeyword sanitizer.

    @redmagic4
    redmagic4 committed Jul 29, 2013
    Copy the full SHA
    ed5e684 View commit details
    Browse the repository at this point in the history

  2. Added missing top level binding

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 29, 2013
    Copy the full SHA
    7e50b52 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #32 from redmagic4/develop 

    Fixed a bug in ecore2clafer.jar related with claferKeyword sanitizer.
    @mantkiew
    mantkiew committed Jul 29, 2013
    Copy the full SHA
    cd837e9 View commit details
    Browse the repository at this point in the history

  4. Fixed a issue where unused abstract clafer's were given cardinality '… 

    …<=0', change this to '=0'
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 29, 2013
    Copy the full SHA
    43745a0 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into WarningFixes

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 29, 2013
    Copy the full SHA
    86bb6f8 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2013

  1. New regression tests

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 30, 2013
    Copy the full SHA
    eb1a109 View commit details
    Browse the repository at this point in the history

  2. resolved conflicts with i131 regression

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 30, 2013
    Copy the full SHA
    0af599c View commit details
    Browse the repository at this point in the history

  3. Added Optimizer to GHC options in make install

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 30, 2013
    Copy the full SHA
    150834b View commit details
    Browse the repository at this point in the history

  4. Added generated top level definition for Version.hs

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 30, 2013
    Copy the full SHA
    351cd3b View commit details
    Browse the repository at this point in the history

  5. removed --nr from of the test models so that we can test it's alloy

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 30, 2013
    Copy the full SHA
    fad1d8e View commit details
    Browse the repository at this point in the history

  6. Added Skip_Goals Command option 

    Also added --sg to the 4 test/postive files that needed it

see:

http://gsd.uwaterloo.ca:8888/question/1059/add-a-parameter-to-skip-code-generation-for
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 30, 2013
    Copy the full SHA
    f0a6c05 View commit details
    Browse the repository at this point in the history

  7. Fixed typo in help message from previous commit

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 30, 2013
    Copy the full SHA
    6c616f5 View commit details
    Browse the repository at this point in the history

  8. improved help message for --skip-goals

    @mantkiew
    mantkiew committed Jul 30, 2013
    Copy the full SHA
    50c8cf2 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2013

  1. Added make new command

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 31, 2013
    Copy the full SHA
    62812cd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'WarningFixes' into i253

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 31, 2013
    Copy the full SHA
    ab95f75 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2013

  1. Changed name of new Make command

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Aug 1, 2013
    Copy the full SHA
    2f1863c View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2013

  1. Added a feature where the compiler will give a nice looking error mes… 

    …sage for naming clafers with keywords
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Aug 6, 2013
    Copy the full SHA
    51214c1 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2013

  1. Merge pull request #30 from gsdlab/WarningFixes 

    Warning fixes
    @JLiangWaterloo
    JLiangWaterloo committed Aug 10, 2013
    Copy the full SHA
    cac5cd5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #33 from gsdlab/i253 

    I253
    @mantkiew
    mantkiew committed Aug 10, 2013
    Copy the full SHA
    4803a16 View commit details
    Browse the repository at this point in the history

  3. new version

    @mantkiew
    mantkiew committed Aug 10, 2013
    Copy the full SHA
    770a161 View commit details
    Browse the repository at this point in the history

  4. updated regression test suite with Clafer v0.3.3.10-8-2013

    @mantkiew
    mantkiew committed Aug 10, 2013
    Copy the full SHA
    38cdd85 View commit details
    Browse the repository at this point in the history

  5. updated 0.3.3 vs 0.3.2 comparison 

    everything as expected
    @mantkiew
    mantkiew committed Aug 10, 2013
    Copy the full SHA
    e20c7c0 View commit details
    Browse the repository at this point in the history

  6. removed regression-0.3.3 

    this will be created for the 0.3.4 release. For 0.3.3, the folder
regression contains the current regression test suite
    @mantkiew
    mantkiew committed Aug 10, 2013
    Copy the full SHA
    5dc1d9b View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2013

  1. updated versions of dependencies

    @mantkiew
    mantkiew committed Aug 11, 2013
    Copy the full SHA
    6699e45 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2013

  1. release Clafer v0.3.3.14-8-2013

    @mantkiew
    mantkiew committed Aug 13, 2013
    Copy the full SHA
    4c67d42 View commit details
    Browse the repository at this point in the history

  2. release Clafer v0.3.3.14-8-2013

    @mantkiew
    mantkiew committed Aug 13, 2013
    Copy the full SHA
    e6a5354 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2013

  1. a positive test case for --check-afm with inheritance 

    this should not result in an error during the check
    @mantkiew
    mantkiew committed Aug 14, 2013
    Copy the full SHA
    f8d3605 View commit details
    Browse the repository at this point in the history

  2. Fixed a bug for i199 where it would also check abstract clafers

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Aug 14, 2013
    Copy the full SHA
    6522362 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2013

  1. positive and negative tests for --check-afm

    @mantkiew
    mantkiew committed Aug 15, 2013
    Copy the full SHA
    690408c View commit details
    Browse the repository at this point in the history

  2. added missing / when running ecore2clafer

    @mantkiew
    mantkiew committed Aug 15, 2013
    Copy the full SHA
    41f0dfe View commit details
    Browse the repository at this point in the history