1 files changed, 44 insertions, 9 deletions

@@ -39,6 +39,7 @@ BEGIN {
         # Constants
         EXE_NAME = (EXE_NAME ? EXE_NAME : "trainfuck")
         ERR_SYNTAX = 1
+        ERR_ARGUMENT = 2
 }
 
 BEGIN {
@@ -46,6 +47,7 @@ BEGIN {
         ABOARD = 0
         FIRST_LINE = 1
         OFS = "\t"
+        header = 0
 }
 
 BF_MODE == "brainfuck" {
@@ -54,14 +56,16 @@ BF_MODE == "brainfuck" {
 }
 
 FIRST_LINE {
-        if (BF_PRINT_COMMENTS && first_line != "[") {
-                eprint("[")
+        if (BF_PRINT_COMMENTS && $0 !~ /^[ \t]\[/) {
+                eprint("[ ", 1)
         }
-        eprint(first_line)
         FIRST_LINE = 0
 }
 
 /^ALL ABOARD$/ {
+        if (NR == 1) {
+                eprint(ARGV[1] " ", 1)
+        }
         if (! header && BF_PRINT_COMMENTS) {
                 eprint("]")
         }
@@ -94,6 +98,7 @@ END {
                 exit dead
         }
         printbuf()
+        print ""
         if (BF_EXECUTE) {
                 brainfuck(bf_program)
         }
@@ -108,8 +113,11 @@ function brainfuck(buffer)
         for (n = 1; n < 30000; n++) {
                 tape[n] = 0
         }
-        while (c <= length(bf)) {
-                # print i, tape[i], c, bf[c]
+        len_bf = 0
+        for (i in bf) {
+                len_bf++
+        }
+        while (c <= len_bf) {
                 if (bf[c] == "<" && c > 1) {
                         i--
                 } else if (bf[c] == ">") {
@@ -163,10 +171,32 @@ function brainfuck(buffer)
         }
 }
 
-function die(message, errnum)
+function char2number(ch)
+{
+        ascii = ""      # NUL is undefined in POSIX awk ... XXX:
+        ascii = ascii "\001\002\003\004\005\006\a\b\t\n\v\f\r\016\017"
+        ascii = ascii "\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+        ascii = ascii " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNO"
+        ascii = ascii "PQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\177"
+        ascii = ascii "\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217"
+        ascii = ascii "\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237"
+        ascii = ascii "\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257"
+        ascii = ascii "\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277"
+        ascii = ascii "\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317"
+        ascii = ascii "\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337"
+        ascii = ascii "\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357"
+        ascii = ascii "\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377"
+        # print ch
+        return index(ascii, ch)
+}
+
+function die(message, errnum, now)
 {
         print(message) > "/dev/stderr"
         dead = errnum
+        if (now) {
+                exit errnum
+        }
 }
 
 function eprint(message, suppress_newline)
@@ -177,9 +207,9 @@ function eprint(message, suppress_newline)
 function getchar()
 {
         system("stty raw")
-        cmd = "dd bs=1 count=1 2>/dev/null"
-        cmd | getline ch
-        close(cmd)
+        chcmd = "dd bs=1 count=1 2>/dev/null"
+        chcmd | getline ch
+        close(chcmd)
         system("stty cooked")
         return ch
 }
@@ -236,6 +266,11 @@ function process_commandline()
                         BF_MODE = "brainfuck"
                         BF_MODE_FORCE = 1
                         delete ARGV[a]
+                } else if (ARGV[a] == "-q" || ARGV[a] == "--quiet") {
+                        BF_OUTPUT = "/dev/null"
+                        delete ARGV[a]
+                } else if (ARGV[a] ~ /^-/) {
+                        die("Unknown option '" ARGV[a] "'", ERR_ARGUMENT, 1)
                 }
         }
         if (! BF_MODE_FORCE) {