remove special handling of '@ or another ally' by SelectPermanent

grammar/Makefile

@@ -13,7 +13,7 @@ parsable.txt: mtg.peg
 	cat test_all.out | grep FAILED | sort | uniq -c | sort -n > failed.txt
 
 MagicRuleParser.java: mtg.peg
-	-rm *.class
+	-rm *.class $@
 	java -cp Mouse-1.5.1/build/Mouse-1.5.1.jar mouse.Generate -M -G $^ -P MagicRuleParser -S MagicSyntaxTree
 	sed -i 's/accept()/sem.action() \&\& accept()/g' $@
 

grammar/mtg.peg

@@ -238,7 +238,6 @@ EntersGraveyardTrigger
 
 EntersBattlefieldTrigger
     = EntersVerb SPACE SelectPermanent SPACE "enters the battlefield" (SPACE "under your control")?
-    / "whenever @ or another ally enters the battlefield under your control"
     ;
 
 EntersVerb
@@ -741,8 +740,8 @@ SelectCreature
     ;
 
 SelectPermanent
-    = "@"
-    / "it"
+    = "@" (SEP RestrictedPermanent)*
+    / "it" (SEP RestrictedPermanent)*
     / (SelectOp SPACE)? RestrictedPermanent (SEP RestrictedPermanent)*
     ;
 

grammar/parsable.txt

@@ -3998,6 +3998,8 @@ whenever @ or another ally enters the battlefield under your control, you may ha
 whenever @ or another ally enters the battlefield under your control, you may put a +1/+1 counter on @.
 whenever @ or another ally enters the battlefield under your control, you may put a +1/+1 counter on each ally creature you control.
 whenever @ or another ally enters the battlefield under your control, you may put a 2/2 green wolf creature token onto the battlefield. if you do, put a +1/+1 counter on @.
+whenever @ or another artifact enters the battlefield, put a charge counter on @.
+whenever @ or another zombie enters the battlefield, all non-zombie creatures get -1/-1 until end of turn.
 whenever you cast a black spell, @ gains fear until end of turn.
 whenever you cast a black spell, @ gets +1/+1 until end of turn.
 whenever you cast a black spell, remove a -1/-1 counter from @.