# HG changeset patch # User Ryoma SHINYA # Date 1291481336 -32400 # Node ID 87cd1db7ec3fe2229cc3faf9aa0964d12f81ff44 # Parent 19a88707bd29b3fdc44e0106d65e87b2cd156811 modify codegen-indent. diff -r 19a88707bd29 -r 87cd1db7ec3f pyrect/translator/grep_translator.py --- a/pyrect/translator/grep_translator.py Fri Dec 03 18:36:23 2010 +0900 +++ b/pyrect/translator/grep_translator.py Sun Dec 05 01:48:56 2010 +0900 @@ -125,19 +125,19 @@ self.emit( "tmp1 = buf, tmp2 = (UCHARP)key+%d;" % (l-1)) self.emiti( "while (*(--tmp1) == *(--tmp2)) {") self.emit( "if (tmp2 == key) goto next;") - self.emitd( "}") - self.emitd( "}") + self.demit( "}") + self.demit( "}") self.emiti( "switch(*buf) {") for k, v in skip.iteritems(): self.emiti( "case %d: /* %s */" % (ord(k), Character.ascii(k))) self.emit( "buf += %d; break;" % v), self.dedent() self.emiti("default: buf += %d;" % l), self.dedent() - self.emitd( "}") - self.emitd("}") + self.demit( "}") + self.demit("}") self.emit( "return;") self.emit( "next:") emit_next() - self.emitd("}", 2) + self.demit("}", 2) def emit_quick_filter(self, key): l = len(key) @@ -160,7 +160,7 @@ self.emit("buf = memchr(buf, %d, (end - buf));" % ord(key)) self.emit("if (buf == NULL) return;") emit_next() - self.emitd("}", 2) + self.demit("}", 2) return self.emit('static const UCHAR key[] = "%s";' % key) @@ -175,19 +175,19 @@ self.emit( "tmp1 = buf, tmp2 = (UCHARP)key;") self.emiti( "while (*(++tmp1) == *(++tmp2)){") self.emit( "if (tmp2 == key+%d) goto next;" % (l-1)) - self.emitd( "}") - self.emitd( "}") + self.demit( "}") + self.demit( "}") self.emiti( "switch(buf[%d]) {" % l) for k, v in skip.iteritems(): self.emiti( "case %d: /* %s */" % (ord(k), Character.ascii(k))) self.emit( "buf += %d; break;" % v), self.dedent() self.emiti("default: buf += %d;" % (l+1)), self.dedent() - self.emitd( "}") - self.emitd("}") + self.demit( "}") + self.demit("}") self.emit( "return;") self.emit( "next:") emit_next() - self.emitd("}", 2) + self.demit("}", 2) def emit_booster(self, min_len, chars): self.emiti("void booster(%s) {" % self.interface) @@ -198,10 +198,10 @@ for c in chars: self.emit( "case %d: /* %s */" % (ord(c), Character.ascii(c))) self.emit( "goto ret;") - self.emitd( "}") - self.emitd( "} while((buf += %d) <= end_);" % min_len) + self.demit( "}") + self.demit( "} while((buf += %d) <= end_);" % min_len) self.emit( "ret: return %s(%s);" % (self.state_name(self.cg.start) , self.args)) - self.emitd("}", 2) + self.demit("}", 2) def emit_driver(self): self.emiti("void matcher(%s) {" % self.interface) @@ -210,7 +210,7 @@ else: self.emit( "%s(%s);" % (self.state_name(self.cg.start), self.args)) self.emit( "return;") - self.emitd("}", 2) + self.demit("}", 2) return def emit_accept_state(self): @@ -221,18 +221,18 @@ self.emiti( "if (ret == NULL) {") self.emit( "print_line(beg, end);") self.emit( "return;") - self.emitd( "}") + self.demit( "}") self.emit( "print_line(beg, ret);") self.emit( "beg = buf = ret + 1;") self.emit( "%s(%s);" % (self.start, self.args)) - self.emitd("}", 2) + self.demit("}", 2) def emit_reject_state(self): self.emiti("void reject(%s) {" % self.interface) self.emit( "if (buf >= end) return;") self.emit( "beg = buf;") self.emit( "return %s(%s);" % (self.start, self.args)) - self.emitd("}", 2) + self.demit("}", 2) def emit_switch(self, case, default=None): if not case: @@ -246,7 +246,7 @@ self.emit("default: return booster(%s);" % self.args) else: self.emit("default: return %s(%s);" % (default, self.args)) - self.emitd("}") + self.demit("}") def emit_state(self, cur_state, transition): if self.filter_only: return @@ -255,7 +255,7 @@ if cur_state in self.cg.accepts: self.emit( "return accept(beg, buf-1, end);") - self.emitd("}", 2) + self.demit("}", 2) return if transition.has_key(AnyChar()): @@ -275,7 +275,7 @@ self.emit( "static void (*%s_table[256])(UCHARP, UCHARP, UCHARP) = {%s};" % (self.state_name(cur_state), ", ".join(tbl))) self.emit( "return %s_table[*buf++](%s);" % (self.state_name(cur_state), self.args)) - self.emitd("}", 2) + self.demit("}", 2) return for eol in self.eols: @@ -287,7 +287,7 @@ self.emit_switch(transition, default) - self.emitd("}", 2) + self.demit("}", 2) class _trans_stmt(ASTWalker): def __init__(self, emit):