Mercurial > hg > Members > shinya > pyrect
changeset 11:94984eaa03e2
modify some function/variable name, to follow PEP coding donvention.
| author | Ryoma SHINYA <shinya@firefly.cr.ie.u-ryukyu.ac.jp> |
|---|---|
| date | Sun, 04 Jul 2010 00:48:24 +0900 |
| parents | 2d00b46ce34d |
| children | 41391400fe68 |
| files | src/cTranslator.py src/dotTranslator.py src/translator.py |
| diffstat | 3 files changed, 30 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cTranslator.py Sun Jul 04 00:33:15 2010 +0900 +++ b/src/cTranslator.py Sun Jul 04 00:48:24 2010 +0900 @@ -22,15 +22,15 @@ self.breakStatement = '\t\t\tbreak;' self.debug = False if self.cg.type is "DFA": - self.dfaStateNameHash = self.createDFAStateNameHash() + self.name_hash = self.create_name_hash() - def modifyStateName(self, stateName): - if stateName is "accept" or stateName is "reject": - return stateName + def modify_state_name(self, state_name): + if state_name is "accept" or state_name is "reject": + return state_name if self.cg.type is "DFA": - return "state_"+self.dfaStateNameHash[stateName] + return "state_"+self.name_hash[state_name] else: - return "state_"+stateName + return "state_"+state_name def emit_accept_state(self): self.emit (""" @@ -53,7 +53,7 @@ \tputs(\"number of state: %d\"); \tprintf(\"string: %%s\\n\", argv[1]); \t%s%s(argv[1]); -""" % (self.regexp, len(self.cg.states), self.callType, self.modifyStateName(self.cg.start))) +""" % (self.regexp, len(self.cg.states), self.callType, self.modify_state_name(self.cg.start))) if self.cg.type is "NFA": self.emit("\treject(argv[1]);\n") self.emit(""" @@ -72,7 +72,7 @@ if input != '': self.emit("\t\tcase '%s': \n" % (input)) for nextState in nextStates: - self.emit("\t\t\t%s%s(%s);\n" % (self.callType, self.modifyStateName(nextState), sLocal)) + self.emit("\t\t\t%s%s(%s);\n" % (self.callType, self.modify_state_name(nextState), sLocal)) if self.breakStatement != '': self.emit(self.breakStatement+'\n') if default: @@ -81,7 +81,7 @@ def emit_state(self, cur_state, transition): - self.emit(self.funType + self.modifyStateName(cur_state) + "(char* s) {\n") + self.emit(self.funType + self.modify_state_name(cur_state) + "(char* s) {\n") if self.debug: self.emit("\tprintf(\"state: %s, input: %%s\\n\", s);\n" % (cur_state)) if self.cg.type is "NFA": @@ -90,7 +90,7 @@ if '' in transition: epsilon_transition = transition.pop('') for n in epsilon_transition: - self.emit("\t%s%s(%s);\n" % (self.callType, self.modifyStateName(n), sLocal)) + self.emit("\t%s%s(%s);\n" % (self.callType, self.modify_state_name(n), sLocal)) else: sLocal = "s" @@ -104,11 +104,11 @@ self.emit_switch(transition) self.emit("\n}\n\n") - def translateFromCallGraph(self): + def emit_from_callgraph(self): # self.emit C-source code self.emit("#include <stdio.h>\n") for k in self.cg.map.iterkeys(): - self.emit(self.funType + self.modifyStateName(k) + "(char* s);\n") + self.emit(self.funType + self.modify_state_name(k) + "(char* s);\n") self.emit_driver()
--- a/src/dotTranslator.py Sun Jul 04 00:33:15 2010 +0900 +++ b/src/dotTranslator.py Sun Jul 04 00:48:24 2010 +0900 @@ -20,15 +20,15 @@ def __init__(self, regexp, cg): Translator.__init__(self, regexp, cg) if self.cg.type is "DFA": - self.dfaStateNameHash = self.createDFAStateNameHash() + self.name_hash = self.create_name_hash() - def modifyStateName(self, stateName): + def modify_state_name(self, state_name): if self.cg.type is "DFA": - return "s"+self.dfaStateNameHash[stateName] + return "s"+self.name_hash[state_name] else: - return "s"+stateName + return "s"+state_name - def translateFromCallGraph(self): + def emit_from_callgraph(self): self.emit(''' digraph G{ \td2tdocpreamble = "\\usetikzlibrary{automata}"; @@ -38,16 +38,16 @@ \tedge [lblstyle="fill=blue!20", style="arrows=->", topath="bend left"]; ''') - self.emit("\t%s [style=\"state, initial\"]\n" % (self.modifyStateName(self.cg.start))) + self.emit("\t%s [style=\"state, initial\"]\n" % (self.modify_state_name(self.cg.start))) for accept in self.cg.accepts: - self.emit("\t%s [style=\"state, accepting\"]\n" % (self.modifyStateName(accept))) + self.emit("\t%s [style=\"state, accepting\"]\n" % (self.modify_state_name(accept))) - for curState, trans in self.cg.map.iteritems(): - for input, nextStates in trans.iteritems(): + for cur_state, trans in self.cg.map.iteritems(): + for input, next_states in trans.iteritems(): if input is "" : input = "$\\varepsilon$" - for nextState in nextStates: + for next_state in next_states: self.emit("\t%s -> %s [texlbl=\"%s\"]\n" - % (self.modifyStateName(curState), self.modifyStateName(nextState), input)) + % (self.modify_state_name(cur_state), self.modify_state_name(next_state), input)) self.emit("}")
--- a/src/translator.py Sun Jul 04 00:33:15 2010 +0900 +++ b/src/translator.py Sun Jul 04 00:48:24 2010 +0900 @@ -11,19 +11,19 @@ def emit(self, string): self.stream.write(string) - def createDFAStateNameHash(self): - dfaStateNameHash = dict() + def create_name_hash(self): + name_hash = dict() states = list(self.cg.states) for index in range(len(states)): - dfaStateNameHash[states[index]] = str(index) - return dfaStateNameHash + name_hash[states[index]] = str(index) + return name_hash - def modifyStateName(self, stateName): + def modify_state_name(self, stateName): return stateName - def translateFromCallGraph(self): + def emit_from_callgraph(self): pass def translate(self, stream=sys.stdout): self.stream = stream - self.translateFromCallGraph() + self.emit_from_callgraph()