projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_570_playback_skip_fixes_and_cleanup_ml_aholst' into experimental
[vuplus_dvbapp]
/
lib
/
actions
/
parseactions.py
diff --git
a/lib/actions/parseactions.py
b/lib/actions/parseactions.py
index
683febd
..
cad432a
100644
(file)
--- a/
lib/actions/parseactions.py
+++ b/
lib/actions/parseactions.py
@@
-1,6
+1,6
@@
# takes a header file, outputs action ids
# takes a header file, outputs action ids
-import token
, tokenize, os
, sys, string
+import token
ize
, sys, string
def filter(g):
while 1:
def filter(g):
while 1:
@@
-48,6
+48,11
@@
def do_file(f, mode):
if t == "enum" and state == classstate + 1:
actionname = tokens.next()
if t == "enum" and state == classstate + 1:
actionname = tokens.next()
+ if actionname == "{":
+ while tokens.next() != "}":
+ pass
+ continue
+
if actionname[-7:] == "Actions":
if tokens.next() != "{":
try:
if actionname[-7:] == "Actions":
if tokens.next() != "{":
try:
@@
-60,7
+65,7
@@
def do_file(f, mode):
except:
pass
except:
pass
- raise
"action enum must be simple."
+ raise
Exception("action enum must be simple.")
counter = 0
counter = 0
@@
-77,14
+82,14
@@
def do_file(f, mode):
if counter:
if t != ",":
if counter:
if t != ",":
- raise
"no comma"
+ raise
Exception("no comma")
t = tokens.next()
if firsthit:
if mode == "include":
# hack hack hack!!
t = tokens.next()
if firsthit:
if mode == "include":
# hack hack hack!!
- print "#include <lib
" + f[2:]
+ ">"
+ print "#include <lib
/" + '/'.join(f.split('/')[-2:])
+ ">"
else:
print "\t// " + f
else:
print "\t// " + f