g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update compile_keymap.py

daktil_thumb_popravljen
mbarkhau 2016-03-29 18:35:47 +02:00
parent a2d3c0bd93
commit 77fa2b0056
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
keyboard/ergodox_ez/keymaps/german-manuneo/compile_keymap.py
View File

@ -121,32 +121,30 @@ def loads(raw_data):
// # start of the comment // # start of the comment
(.*) # the comment (.*) # the comment
$ # until the end of line $ # until the end of line
""", re.MULTILINE | re.VERBOSE """, re.MULTILINE | re.VERBOSE)
)
INLINE_COMMENT_RE = re.compile(r""" INLINE_COMMENT_RE = re.compile(r"""
(?:[\,\"\[\]\{\}\d]) # anythig that might end a expression ([\,\"\[\]\{\}\d]) # anythig that might end a expression
\s+ # comment must be preceded by whitespace \s+ # comment must be preceded by whitespace
// # start of the comment // # start of the comment
\s # and succeded by whitespace \s # and succeded by whitespace
([^\"\]\}\{\[]*) # the comment (except things which might be json) (?:[^\"\]\}\{\[]*) # the comment (except things which might be json)
$ # until the end of line $ # until the end of line
""", re.MULTILINE | re.VERBOSE """, re.MULTILINE | re.VERBOSE)
)
TRAILING_COMMA_RE = re.compile(r""" TRAILING_COMMA_RE = re.compile(r"""
, # the comma , # the comma
\s* # arbitrary whitespace (including newlines) (?:\s*) # arbitrary whitespace
$ # only works if the trailing comma is followed by newline
(\s*) # arbitrary whitespace
([\]\}]) # end of an array or object ([\]\}]) # end of an array or object
""", re.MULTILINE | re.VERBOSE """, re.MULTILINE | re.VERBOSE)
)
if isinstance(raw_data, bytes): if isinstance(raw_data, bytes):
raw_data = raw_data.decode('utf-8') raw_data = raw_data.decode('utf-8')
raw_data = ONELINE_COMMENT_RE.sub(r"", raw_data) raw_data = ONELINE_COMMENT_RE.sub(r"", raw_data)
raw_data = INLINE_COMMENT_RE.sub(r"\1", raw_data) raw_data = INLINE_COMMENT_RE.sub(r"\1", raw_data)
raw_data = TRAILING_COMMA_RE.sub(r"\1", raw_data) raw_data = TRAILING_COMMA_RE.sub(r"\1\2", raw_data)
return json.loads(raw_data) return json.loads(raw_data)