Skip to content
Snippets Groups Projects

Resolve "Feature: Add context-free connect"

Merged Resolve "Feature: Add context-free connect"
34-feature-add-context-free-connect into dev
Merged René Schöne requested to merge 34-feature-add-context-free-connect into dev
Viewing commit 8e85179e
Prev Next
Show latest version
1 file
+ 2
− 0
Compare changes
  • Side-by-side
  • Inline
  • 8e85179e 
    # Conflicts:
#	ragconnect.base/src/main/jastadd/Analysis.jrag
#	ragconnect.base/src/main/jastadd/Errors.jrag
#	ragconnect.base/src/main/jastadd/Intermediate.jadd
#	ragconnect.base/src/main/jastadd/Intermediate.relast
#	ragconnect.base/src/main/jastadd/Mappings.jrag
#	ragconnect.base/src/main/jastadd/NameResolution.jrag
#	ragconnect.base/src/main/jastadd/Navigation.jrag
#	ragconnect.base/src/main/jastadd/RagConnect.relast
#	ragconnect.base/src/main/jastadd/parser/ParserRewrites.jrag
#	ragconnect.base/src/main/jastadd/parser/RagConnect.parser
#	ragconnect.base/src/main/resources/ragconnect.mustache
ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/singleListVariant/SingleListVariantIncrementalVariantTest.java
+ 2
− 0
package org.jastadd.ragconnect.tests.singleListVariant;
import org.jastadd.ragconnect.tests.TestUtils;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Tag;
import singleListVariantInc.ast.*;
@@ -16,6 +17,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* @author rschoene - Initial contribution
*/
@Tag("Incremental")
@Disabled("Fails indeterministically")
public class SingleListVariantIncrementalVariantTest extends AbstractSingleListVariantTest {
private Root model;