6502/foco65
1
0
Fork 0
mirror of https://github.com/piotr-wiszowaty/foco65.git synced 2024-12-19 02:30:08 +00:00
Code Issues Projects Releases Wiki Activity

Fix 6a255534 leftovers

Browse Source
This commit is contained in:
Piotr Wiszowaty 2014-07-25 19:22:13 +02:00
parent 6a255534df
commit a6fb96c3af
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
foco65
View File

@ -172,7 +172,8 @@ class Word:
def output(self, section): def output(self, section):
if self.used and self.section == section: if self.used and self.section == section:
if self.code: if self.code:
return "%s\n dta a(*+2)\n%s\n" % (self.label, self.code) cout = self.code.output(section)
return "%s\n dta a(*+2)\n%s\n" % (self.label, cout)
else: else:
s = "\n".join(map(lambda l: " dta a(%s)" % l, self.thread)) s = "\n".join(map(lambda l: " dta a(%s)" % l, self.thread))
return "%s\n%s\n\n" % (self.label, s) return "%s\n%s\n\n" % (self.label, s)
@ -400,7 +401,12 @@ class Forth:
self.push(x1 / x2) self.push(x1 / x2)
elif token == "]": elif token == "]":
self.word.add("lit") self.word.add("lit")
self.word.add(self.pop(token).output(self.text_section)) tos = self.pop(token)
if isinstance(tos, int):
txt = str(tos)
else:
txt = tos.output(self.text_section)
self.word.add(txt)
self.set_state("compile") self.set_state("compile")
elif self.isnumber(token): elif self.isnumber(token):
self.push(self.tonumber(token.text)) self.push(self.tonumber(token.text))
@ -786,7 +792,7 @@ until_end
""" """
basewords_text = """ basewords_text = """
[text-section] code [text-section] text
: drop : drop
[code] [code]