From ec9c9632970dc817a13ab954c3e4d86ad8731527 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Fri, 14 Feb 2014 11:42:24 +0000 Subject: yarns: Remove code to check refs to strata It should no longer be possible to set these fields. Either we create the morphologies with them in a GIVEN, at which point we already know it's there, so checking whether it is there is pointless; or we check that morph doesn't create them, but the current implementation would not allow it, since yarn doesn't have THEN NOT. --- yarns/implementations.yarn | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'yarns') diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index 2a46dfa2..bf6cec56 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -409,12 +409,11 @@ Report system branch root repository. Editing morphologies with `morph edit`. - IMPLEMENTS THEN in branch (\S+), (system|stratum) (\S+) refs (\S+) in (\S+) - if [ $MATCH_2 == system ]; then set strata; else set chunks; fi + IMPLEMENTS THEN in branch (\S+), stratum (\S+) refs (\S+) in (\S+) "$SRCDIR/scripts/yaml-extract" \ - "$DATADIR/workspace/$MATCH_1/test:morphs/$MATCH_3.morph" \ - $@ name="$MATCH_4" ref > "$DATADIR/ref.actual" - echo "$MATCH_5" > "$DATADIR/ref.wanted" + "$DATADIR/workspace/$MATCH_1/test:morphs/$MATCH_2.morph" \ + chunks name="$MATCH_3" ref > "$DATADIR/ref.actual" + echo "$MATCH_4" > "$DATADIR/ref.wanted" diff -u "$DATADIR/ref.wanted" "$DATADIR/ref.actual" IMPLEMENTS WHEN the user edits the stratum (\S+) in the system (\S+) in branch (\S+) -- cgit v1.2.1