ircyrano

commit ad0def188defc94d1156c26b5cd81da9d0db3540
parent 3113f5a84be11765ada0897e57b94d3b54519d49
Author: Antoine Amarilli <a3nm@a3nm.net>
Date:   Sat, 29 Dec 2012 12:40:24 +0100

MASTER is ER, different handling of /nick

Diffstat:
prefix.pl
 | 
2
+-
wellformed.py
 | 
28
++++++++++++++--------------

2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/prefix.pl b/prefix.pl
@@ -16,7 +16,7 @@ while (<>) {
     if ($prefix) {
       print "<$prefix>$_";
     } else {
-      print "<MASTER> $_" if (!/^$/);
+      print "<ER> $_" if (!/^$/);
     }
   } else {
     $skip = 0;
diff --git a/wellformed.py b/wellformed.py
@@ -17,7 +17,7 @@ while True:
   if len(f) < 2:
     continue
   p = f[0]
-  fw = f[1]
+  fw = f[2]
   if p not in status.keys():
     status[p] = "out"
   if fw == "/join":
@@ -33,23 +33,23 @@ while True:
       print("line %d: %s leaves but is already out of stage" % (no, p))
     status[p] = "out"
     onstage -= 1
-  elif fw == "/nick":
-    fw2 = "<" + f[2] + ">"
-    if fw2 not in status.keys():
-      status[fw2] = "out"
-    if status[fw2] != "out":
-      print("line %d: %s name clash" % (no, fw2))
-    if status[p] != "in":
-      print("line %d: %s leaves but is already out of stage" % (no, p))
-    status[p] = "out"
-    status[fw2] = "in"
-  elif fw.startswith("Rideau") and p == "<MASTER>":
+  #elif fw == "/nick":
+  #  fw2 = f[3]
+  #  if fw2 not in status.keys():
+  #    status[fw2] = "out"
+  #  if status[fw2] != "out":
+  #    print("line %d: %s name clash" % (no, fw2))
+  #  if status[p] != "in":
+  #    print("line %d: %s leaves but is already out of stage" % (no, p))
+  #  status[p] = "out"
+  #  status[fw2] = "in"
+  elif p == "ER" and f[3].startswith("Rideau"):
     for x in status.keys():
-      if x == "<MASTER>":
+      if x == "ER":
         continue
       if status[x] != "out":
         print("line %d: %s still on stage at act end" % (no, x))
-  elif p != "<MASTER>":
+  elif p != "ER" and fw != "/nick":
     if status[p] != "in":
       print("line %d: %s speaks but is out of stage" % (no, p))
       status[p] = "in"