From 69a7b9e83725599151f3804aa48e5a31014271c4 Mon Sep 17 00:00:00 2001 From: Cosmin Radoi Date: Tue, 9 Feb 2016 14:29:13 -0600 Subject: [PATCH 1/9] copyright --- API/pom.xml | 2 +- coq-backend/pom.xml | 2 +- k-distribution/documentation/README.md | 2 +- .../error-messages/config-var-not-exist-or-missing/config.xml | 2 +- k-distribution/tests/regression/issue1724/config.xml | 2 +- .../regression/kore-cell-fragments/cell_arguments/config.xml | 2 +- k-distribution/tests/regression/kore-cell-fragments/config.xml | 2 +- .../tests/regression/kore-cell-fragments/imp++/config.xml | 2 +- .../regression/kore-cell-fragments/imp_fragments/config.xml | 2 +- .../tests/regression/kore-cell-fragments/kool/tests/config.xml | 2 +- k-distribution/tests/regression/kore-context/tests/config.xml | 2 +- k-distribution/tests/regression/kore-io/tests/config.xml | 2 +- k-distribution/tests/regression/ocamlbackend/tests/config.xml | 2 +- k-distribution/tests/regression/smt-sort-flattening/config.xml | 2 +- k-distribution/tutorial/tests/config.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/API/pom.xml b/API/pom.xml index e190f7c91d..32472b04f9 100644 --- a/API/pom.xml +++ b/API/pom.xml @@ -1,5 +1,5 @@ - + diff --git a/coq-backend/pom.xml b/coq-backend/pom.xml index f0762ce6e7..3d74a1d41a 100644 --- a/coq-backend/pom.xml +++ b/coq-backend/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 diff --git a/k-distribution/documentation/README.md b/k-distribution/documentation/README.md index 34f7c5e4d7..bc3669b30b 100644 --- a/k-distribution/documentation/README.md +++ b/k-distribution/documentation/README.md @@ -1,4 +1,4 @@ - + To build the reference manual, run: ``` kompile ref-manual.k --main-module AUTO-INCLUDED-MODULE diff --git a/k-distribution/tests/regression/error-messages/config-var-not-exist-or-missing/config.xml b/k-distribution/tests/regression/error-messages/config-var-not-exist-or-missing/config.xml index b10ee0b7cc..dde20451b7 100644 --- a/k-distribution/tests/regression/error-messages/config-var-not-exist-or-missing/config.xml +++ b/k-distribution/tests/regression/error-messages/config-var-not-exist-or-missing/config.xml @@ -1,5 +1,5 @@ - + - + - + diff --git a/k-distribution/tests/regression/kore-cell-fragments/config.xml b/k-distribution/tests/regression/kore-cell-fragments/config.xml index 7246f9692c..129d8d6147 100644 --- a/k-distribution/tests/regression/kore-cell-fragments/config.xml +++ b/k-distribution/tests/regression/kore-cell-fragments/config.xml @@ -1,5 +1,5 @@ - + - + - + - + - + - + - + - + - + + ============================================================================== The K Release License ============================================================================== diff --git a/k-distribution/INSTALL.md b/k-distribution/INSTALL.md index 51f4e0f505..75f6dd9f9a 100644 --- a/k-distribution/INSTALL.md +++ b/k-distribution/INSTALL.md @@ -1,4 +1,4 @@ - + Here are instructions for installing K from the release zip/tgz archive. 1. Prerequisites: diff --git a/k-distribution/README.md b/k-distribution/README.md index f8404e5506..b121c99b14 100644 --- a/k-distribution/README.md +++ b/k-distribution/README.md @@ -1,4 +1,4 @@ - + K tool, version 3.6 ------------------- diff --git a/k-distribution/samples-kore/kernelc/tests/avl_tree/config.xml b/k-distribution/samples-kore/kernelc/tests/avl_tree/config.xml index 52801e755f..a6344516f7 100644 --- a/k-distribution/samples-kore/kernelc/tests/avl_tree/config.xml +++ b/k-distribution/samples-kore/kernelc/tests/avl_tree/config.xml @@ -1,5 +1,5 @@ - + - + - + - + diff --git a/k-distribution/samples-kore/kernelc/tests/execution/config.xml b/k-distribution/samples-kore/kernelc/tests/execution/config.xml index e8f616db0f..57204bb90c 100644 --- a/k-distribution/samples-kore/kernelc/tests/execution/config.xml +++ b/k-distribution/samples-kore/kernelc/tests/execution/config.xml @@ -1,5 +1,5 @@ - + - + - + - + - + - + - + - + diff --git a/k-distribution/samples/wcet/tests/config.xml b/k-distribution/samples/wcet/tests/config.xml index 4a064528e7..43c99df129 100644 --- a/k-distribution/samples/wcet/tests/config.xml +++ b/k-distribution/samples/wcet/tests/config.xml @@ -1,5 +1,5 @@ - + - + - + diff --git a/k-distribution/tests/regression/external/tests/config.xml b/k-distribution/tests/regression/external/tests/config.xml index 40be2a8374..b694761e32 100644 --- a/k-distribution/tests/regression/external/tests/config.xml +++ b/k-distribution/tests/regression/external/tests/config.xml @@ -1,5 +1,5 @@ - + - + diff --git a/k-distribution/tests/regression/java-rewrite-engine/config.xml b/k-distribution/tests/regression/java-rewrite-engine/config.xml index 18a9239d84..7bbfdc9e0d 100644 --- a/k-distribution/tests/regression/java-rewrite-engine/config.xml +++ b/k-distribution/tests/regression/java-rewrite-engine/config.xml @@ -1,5 +1,5 @@ - + diff --git a/k-distribution/tests/regression/tests/config.xml b/k-distribution/tests/regression/tests/config.xml index 78690fdce3..71d767bba1 100644 --- a/k-distribution/tests/regression/tests/config.xml +++ b/k-distribution/tests/regression/tests/config.xml @@ -1,5 +1,5 @@ - + diff --git a/k-distribution/tutorial/1_k/tests/config.xml b/k-distribution/tutorial/1_k/tests/config.xml index 9a0fbb05d7..8ba0d73009 100644 --- a/k-distribution/tutorial/1_k/tests/config.xml +++ b/k-distribution/tutorial/1_k/tests/config.xml @@ -1,5 +1,5 @@ - + + Date: Tue, 9 Feb 2016 14:35:20 -0600 Subject: [PATCH 3/9] copyright --- java-backend/pom.xml | 2 +- k-distribution/pom.xml | 2 +- kernel/pom.xml | 2 +- kore/pom.xml | 2 +- tiny/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java-backend/pom.xml b/java-backend/pom.xml index 020fa12a13..d7df62a194 100644 --- a/java-backend/pom.xml +++ b/java-backend/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 diff --git a/k-distribution/pom.xml b/k-distribution/pom.xml index 2ac40eed83..4f9eb439ef 100644 --- a/k-distribution/pom.xml +++ b/k-distribution/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 diff --git a/kernel/pom.xml b/kernel/pom.xml index 18ba1dec53..277caf2f1b 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 diff --git a/kore/pom.xml b/kore/pom.xml index a4e5111281..02c0232de8 100644 --- a/kore/pom.xml +++ b/kore/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 diff --git a/tiny/pom.xml b/tiny/pom.xml index dd700b3e73..46c112e863 100644 --- a/tiny/pom.xml +++ b/tiny/pom.xml @@ -1,5 +1,5 @@ - + org.kframework.k From 718cc72b74e5ac15e6b689f0f87685db3f74b849 Mon Sep 17 00:00:00 2001 From: Cosmin Radoi Date: Tue, 9 Feb 2016 14:37:29 -0600 Subject: [PATCH 4/9] copyright --- k-distribution/include/latex/k.sty | 2 +- k-distribution/src/main/assembly/bin.xml | 2 +- kernel/src/main/javacc/DebuggerCommandParser.jj | 2 +- kernel/src/main/resources/org/kframework/ktest/Config/ktest.xsd | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/k-distribution/include/latex/k.sty b/k-distribution/include/latex/k.sty index 37b5a83a9a..749f77ab9d 100644 --- a/k-distribution/include/latex/k.sty +++ b/k-distribution/include/latex/k.sty @@ -1,4 +1,4 @@ -% Copyright (c) 2012-2015 K Team. All Rights Reserved. +% Copyright (c) 2012-2016 K Team. All Rights Reserved. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{k}[2012/02/14 Package for typesetting K Framework definitions http://k-framework.org] diff --git a/k-distribution/src/main/assembly/bin.xml b/k-distribution/src/main/assembly/bin.xml index c803425c13..848f598469 100644 --- a/k-distribution/src/main/assembly/bin.xml +++ b/k-distribution/src/main/assembly/bin.xml @@ -1,5 +1,5 @@ - + diff --git a/kernel/src/main/javacc/DebuggerCommandParser.jj b/kernel/src/main/javacc/DebuggerCommandParser.jj index 0a34899c34..fb8873b9ed 100644 --- a/kernel/src/main/javacc/DebuggerCommandParser.jj +++ b/kernel/src/main/javacc/DebuggerCommandParser.jj @@ -1,4 +1,4 @@ -// Copyright (c) 2015 K Team. All Rights Reserved. +// Copyright (c) 2015-2016 K Team. All Rights Reserved. // Represents the grammar accepted by the Debugger TUI. options { diff --git a/kernel/src/main/resources/org/kframework/ktest/Config/ktest.xsd b/kernel/src/main/resources/org/kframework/ktest/Config/ktest.xsd index 09f9a0d740..f760323ffc 100644 --- a/kernel/src/main/resources/org/kframework/ktest/Config/ktest.xsd +++ b/kernel/src/main/resources/org/kframework/ktest/Config/ktest.xsd @@ -1,5 +1,5 @@ - + From e8e65779961be250d1a261988aa6669b363ce696 Mon Sep 17 00:00:00 2001 From: Cosmin Radoi Date: Tue, 9 Feb 2016 14:45:09 -0600 Subject: [PATCH 5/9] ignore UseSMT test --- .../java/org/kframework/backend/java/symbolic/UseSMTTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java-backend/src/test/java/org/kframework/backend/java/symbolic/UseSMTTest.java b/java-backend/src/test/java/org/kframework/backend/java/symbolic/UseSMTTest.java index 75bcb17a3c..436d718ce5 100644 --- a/java-backend/src/test/java/org/kframework/backend/java/symbolic/UseSMTTest.java +++ b/java-backend/src/test/java/org/kframework/backend/java/symbolic/UseSMTTest.java @@ -3,6 +3,7 @@ import com.google.common.collect.HashMultimap; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.kframework.backend.java.builtins.BoolToken; @@ -46,7 +47,7 @@ public void setUp() { when(tc.global()).thenReturn(global); } - @Test + @Test @Ignore public void testGetModel() { System.err.println(System.getProperty("java.library.path")); BuiltinMap.Builder builder = new BuiltinMap.Builder(tc.global()); From 984ad9d971b37d6404e954e5f057229b33e8b209 Mon Sep 17 00:00:00 2001 From: Cosmin Radoi Date: Tue, 9 Feb 2016 14:49:07 -0600 Subject: [PATCH 6/9] remove RV from distribution --- pom.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pom.xml b/pom.xml index f534a3a92d..c59a6572d6 100644 --- a/pom.xml +++ b/pom.xml @@ -39,18 +39,6 @@ false - - - runtime-verification - Runtime Verification Repository - http://office.runtimeverification.com:8888/repository/internal - - - runtime-verification.snapshots - Runtime Verification Snapshot Repository - http://office.runtimeverification.com:8888/repository/snapshots - - master From 8036c49ffe90a468a8d6b412ff4cbff2f778601b Mon Sep 17 00:00:00 2001 From: Cosmin Radoi Date: Tue, 9 Feb 2016 14:50:42 -0600 Subject: [PATCH 7/9] beta --- API/pom.xml | 2 +- coq-backend/pom.xml | 2 +- java-backend/pom.xml | 2 +- k-distribution/pom.xml | 2 +- kernel/pom.xml | 2 +- kore/pom.xml | 2 +- pom.xml | 2 +- tiny/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/API/pom.xml b/API/pom.xml index 32472b04f9..444ccd889b 100644 --- a/API/pom.xml +++ b/API/pom.xml @@ -6,7 +6,7 @@ parent org.kframework.k - 4.0-beta4-SNAPSHOT + 4.0-beta-SNAPSHOT ../pom.xml 4.0.0 diff --git a/coq-backend/pom.xml b/coq-backend/pom.xml index 3d74a1d41a..886c1bb4cd 100644 --- a/coq-backend/pom.xml +++ b/coq-backend/pom.xml @@ -6,7 +6,7 @@ org.kframework.k parent - 4.0-beta4-SNAPSHOT + 4.0-beta-SNAPSHOT coq-backend jar diff --git a/java-backend/pom.xml b/java-backend/pom.xml index d7df62a194..cfee69c60d 100644 --- a/java-backend/pom.xml +++ b/java-backend/pom.xml @@ -6,7 +6,7 @@ org.kframework.k parent - 4.0-beta4-SNAPSHOT + 4.0-beta-SNAPSHOT java-backend jar diff --git a/k-distribution/pom.xml b/k-distribution/pom.xml index 4f9eb439ef..cf4b7a345f 100644 --- a/k-distribution/pom.xml +++ b/k-distribution/pom.xml @@ -6,7 +6,7 @@ org.kframework.k parent - 4.0-beta4-SNAPSHOT + 4.0-beta-SNAPSHOT k-distribution jar diff --git a/kernel/pom.xml b/kernel/pom.xml index 277caf2f1b..708dcb82ee 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -6,7 +6,7 @@ org.kframework.k parent - 4.0-beta4-SNAPSHOT + 4.0-beta-SNAPSHOT kernel jar diff --git a/kore/pom.xml b/kore/pom.xml index 02c0232de8..a437c6a1f1 100644 --- a/kore/pom.xml +++ b/kore/pom.xml @@ -6,7 +6,7 @@ org.kframework.k parent - 4.0-beta4-SNAPSHOT + 4.0-beta-SNAPSHOT ../pom.xml kore diff --git a/pom.xml b/pom.xml index c59a6572d6..27e399f9bc 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.kframework.k parent pom - 4.0-beta4-SNAPSHOT + 4.0-beta-SNAPSHOT K Framework Tool Parent diff --git a/tiny/pom.xml b/tiny/pom.xml index 46c112e863..7be87ddad2 100644 --- a/tiny/pom.xml +++ b/tiny/pom.xml @@ -4,7 +4,7 @@ org.kframework.k parent - 4.0-beta4-SNAPSHOT + 4.0-beta-SNAPSHOT ../pom.xml 4.0.0 From b10478430dc01f09be387df726e033c1c26aa8df Mon Sep 17 00:00:00 2001 From: Cosmin Radoi Date: Tue, 9 Feb 2016 14:52:01 -0600 Subject: [PATCH 8/9] fix warning --- .../scala/org/kframework/kore/compile/AssocCommToAssoc.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kore/src/main/scala/org/kframework/kore/compile/AssocCommToAssoc.scala b/kore/src/main/scala/org/kframework/kore/compile/AssocCommToAssoc.scala index 6ee73a119d..4d9bcc7af2 100644 --- a/kore/src/main/scala/org/kframework/kore/compile/AssocCommToAssoc.scala +++ b/kore/src/main/scala/org/kframework/kore/compile/AssocCommToAssoc.scala @@ -126,7 +126,7 @@ class AssocCommToAssoc(c: Constructors[K]) extends (Module => Module) { def crossProduct[T](lls: List[List[T]]): List[List[T]] = { lls match { case (head: List[T]) :: (tail: List[List[T]]) => - for {(x: T) <- head; (xs: List[T]) <- crossProduct(tail)} yield x :: xs + for {x <- head; (xs: List[T]) <- crossProduct(tail)} yield x :: xs case List() => List(List()) } } From 2e9803352879d5101a057307aa21043b73cd5100 Mon Sep 17 00:00:00 2001 From: Cosmin Radoi Date: Tue, 9 Feb 2016 14:57:23 -0600 Subject: [PATCH 9/9] beta release --- API/pom.xml | 2 +- coq-backend/pom.xml | 2 +- java-backend/pom.xml | 2 +- k-distribution/pom.xml | 2 +- kernel/pom.xml | 2 +- kore/pom.xml | 2 +- pom.xml | 2 +- tiny/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/API/pom.xml b/API/pom.xml index 444ccd889b..590ba7562d 100644 --- a/API/pom.xml +++ b/API/pom.xml @@ -6,7 +6,7 @@ parent org.kframework.k - 4.0-beta-SNAPSHOT + 4.0-beta ../pom.xml 4.0.0 diff --git a/coq-backend/pom.xml b/coq-backend/pom.xml index 886c1bb4cd..78d17edbb8 100644 --- a/coq-backend/pom.xml +++ b/coq-backend/pom.xml @@ -6,7 +6,7 @@ org.kframework.k parent - 4.0-beta-SNAPSHOT + 4.0-beta coq-backend jar diff --git a/java-backend/pom.xml b/java-backend/pom.xml index cfee69c60d..eb3c641509 100644 --- a/java-backend/pom.xml +++ b/java-backend/pom.xml @@ -6,7 +6,7 @@ org.kframework.k parent - 4.0-beta-SNAPSHOT + 4.0-beta java-backend jar diff --git a/k-distribution/pom.xml b/k-distribution/pom.xml index cf4b7a345f..11228be301 100644 --- a/k-distribution/pom.xml +++ b/k-distribution/pom.xml @@ -6,7 +6,7 @@ org.kframework.k parent - 4.0-beta-SNAPSHOT + 4.0-beta k-distribution jar diff --git a/kernel/pom.xml b/kernel/pom.xml index 708dcb82ee..cf1089b143 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -6,7 +6,7 @@ org.kframework.k parent - 4.0-beta-SNAPSHOT + 4.0-beta kernel jar diff --git a/kore/pom.xml b/kore/pom.xml index a437c6a1f1..2fc7e8f26a 100644 --- a/kore/pom.xml +++ b/kore/pom.xml @@ -6,7 +6,7 @@ org.kframework.k parent - 4.0-beta-SNAPSHOT + 4.0-beta ../pom.xml kore diff --git a/pom.xml b/pom.xml index 27e399f9bc..405976026e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.kframework.k parent pom - 4.0-beta-SNAPSHOT + 4.0-beta K Framework Tool Parent diff --git a/tiny/pom.xml b/tiny/pom.xml index 7be87ddad2..9aa061dd78 100644 --- a/tiny/pom.xml +++ b/tiny/pom.xml @@ -4,7 +4,7 @@ org.kframework.k parent - 4.0-beta-SNAPSHOT + 4.0-beta ../pom.xml 4.0.0