summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-02-14 11:42:24 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-02-14 11:42:24 (GMT)
commitec9c9632970dc817a13ab954c3e4d86ad8731527 (patch)
treea40b2482a575d23d17a353e9128abeb8d6ad6c6b
parent8f8fc96b884e7f175d4a01bc2d91452d7149bf33 (diff)
downloadmorph-ec9c9632970dc817a13ab954c3e4d86ad8731527.tar.gz
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.
-rw-r--r--yarns/implementations.yarn9
1 files changed, 4 insertions, 5 deletions
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index 2a46dfa..bf6cec5 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+)