d6
/
pmacs3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates 

--HG--
branch : pmacs2
This commit is contained in:
moculus 2008-07-19 20:00:11 +00:00
parent bb302ee3a6
commit b24189f302
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application.py
View File

@ -65,7 +65,7 @@ class Application(object):
'string.octal': ('magenta', 'default', 'bold'), 'string.octal': ('magenta', 'default', 'bold'),
'string.escaped': ('magenta', 'default', 'bold'), 'string.escaped': ('magenta', 'default', 'bold'),
'string.end': ('green', 'default', 'bold'), 'string.end': ('green', 'default', 'bold'),
'char': ('default', 'default', 'bold'), 'char': ('green', 'default', 'bold'),
'integer': ('default', 'default', 'bold'), 'integer': ('default', 'default', 'bold'),
'float': ('default', 'default', 'bold'), 'float': ('default', 'default', 'bold'),
'number': ('default', 'default', 'bold'), 'number': ('default', 'default', 'bold'),

11
mode/c.py
View File

@ -97,8 +97,7 @@ class CTabber(tab.StackTabber):
self._opt_pop('cont') self._opt_pop('cont')
token = self.get_token(y, i) token = self.get_token(y, i)
if token.string == '{': if token.string == '{':
self._opt_pop('cond') self._pop_while('cond', 'cont')
self._opt_pop('cont')
if self.is_leftmost_token(y, i): if self.is_leftmost_token(y, i):
currlvl = self.get_curr_level() currlvl = self.get_curr_level()
tab.StackTabber._handle_open_token(self, currlvl, y, i) tab.StackTabber._handle_open_token(self, currlvl, y, i)
@ -110,8 +109,7 @@ class CTabber(tab.StackTabber):
token = self.get_token(y, i) token = self.get_token(y, i)
if self.is_rightmost_token(y, i): if self.is_rightmost_token(y, i):
if token.string == '}': if token.string == '}':
self._opt_pop('cond') self._pop_while('cond', 'cont')
self._opt_pop('cont')
elif self._has_markers() and self._peek_name() == 'cond': elif self._has_markers() and self._peek_name() == 'cond':
pass pass
else: else:
@ -123,10 +121,7 @@ class CTabber(tab.StackTabber):
token = self.get_token(y, i) token = self.get_token(y, i)
fqname = token.fqname() fqname = token.fqname()
if fqname == 'delimiter' and token.string == ';': if fqname == 'delimiter' and token.string == ';':
self._opt_pop('cond') self._pop_while('cond', 'cont')
self._opt_pop('cont')
self._opt_pop('cond')
self._opt_pop('cont')
elif fqname == 'keyword': elif fqname == 'keyword':
if token.string in ('do', 'else', 'for', 'if', 'while'): if token.string in ('do', 'else', 'for', 'if', 'while'):

10
mode/lisp.py
View File

@ -21,12 +21,16 @@ class LispTabber(tab.StackTabber):
def _handle_open_token(self, currlvl, y, i): def _handle_open_token(self, currlvl, y, i):
token = self.get_token(y, i) token = self.get_token(y, i)
rtoken = self.get_next_right_token(y, i) rtoken = self.get_next_right_token(y, i)
if rtoken is not None and rtoken.string != '(':
rtoken = self.get_next_right_token(y, i + 1)
if rtoken is None: if rtoken is None:
level = self.get_curr_level() + self.mode.tabwidth level = self.get_curr_level() + self.mode.tabwidth
elif rtoken.string not in ('(', 'define', 'lambda'):
rtoken = self.get_next_right_token(y, i + 1)
if rtoken is None or rtoken.string != '(':
level = self.get_curr_level() + self.mode.tabwidth
else:
level = rtoken.x
else: else:
level = rtoken.x level = self.get_curr_level() + self.mode.tabwidth
self._append(token.string, level) self._append(token.string, level)
return currlvl return currlvl