--- i8080-compiler.py   2012-03-21 20:06:49.000000000 +0800
+++ /home/bkmz/Downloads/Skype/compiler.py      2012-03-21 22:39:52.000000000 +0800
@@ -1,4 +1,3 @@
-#!/usr/bin/env python2.7
 import re
 import sys

@@ -119,7 +118,7 @@
             processed = True

         if not processed:
-            raise CompilerError("instruction is unknown or mailformed at line %d\n>>\t%s" % (ln+1, line))
+            raise CompilerError("instruction is unknown or mailformed at line %d\n>>\t%s" % (ln, line))

     # Insert ending position and return
     result.append(d("00"))
@@ -300,7 +299,23 @@
 "STAX B": "02",
 "STAX D": "12",
 "HLT": "76",
-"RET": "C9"
+"RET": "C9",
+"RZ": "C8",
+"RNZ": "C0",
+"RNC": "D0",
+"RC": "D8",
+"RPO": "E0",
+"RPE": "E8",
+"^RP$": "F0",
+"RM": "F8",
+"PUSH B": "C5",
+"PUSH D": "D5",
+"PUSH H": "E5",
+"PUSH PSW": "F5",
+"POP B": "C1",
+"POP D": "D1",
+"POP H": "E1",
+"POP PSW": "F1"
 } #}}}

 TWOBYTES = { #{{{
@@ -379,3 +394,4 @@
     f.close()

 # }
+