diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-06-10 15:15:16 +0200 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-07-13 16:30:36 +0200 |
| commit | 893b74c770b81f2c09094577e2de720155f84b61 (patch) | |
| tree | ce430f554cf032c70eab8a95228731afbffc6efd /grc/core/utils/expr_utils.py | |
| parent | 7ac7cf6246e4d984d36c64df10ba4d2b2f6b2204 (diff) | |
| parent | 6fb0ff274a05daf2f2677af14337704fb88081f7 (diff) | |
Merge remote-tracking branch 'grcwg/next_grcwg' into gtk3
Diffstat (limited to 'grc/core/utils/expr_utils.py')
| -rw-r--r-- | grc/core/utils/expr_utils.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/grc/core/utils/expr_utils.py b/grc/core/utils/expr_utils.py index 0577f06a75..555bd709b1 100644 --- a/grc/core/utils/expr_utils.py +++ b/grc/core/utils/expr_utils.py @@ -61,7 +61,7 @@ class graph(object): return self._graph[node_key] -def expr_split(expr): +def expr_split(expr, var_chars=VAR_CHARS): """ Split up an expression by non alphanumeric characters, including underscore. Leave strings in-tact. @@ -77,7 +77,7 @@ def expr_split(expr): tok = '' quote = '' for char in expr: - if quote or char in VAR_CHARS: + if quote or char in var_chars: if char == quote: quote = '' tok += char @@ -104,7 +104,7 @@ def expr_replace(expr, replace_dict): Returns: a new expression with the prepend """ - expr_splits = expr_split(expr) + expr_splits = expr_split(expr, var_chars=VAR_CHARS + '.') for i, es in enumerate(expr_splits): if es in list(replace_dict.keys()): expr_splits[i] = replace_dict[es] @@ -195,7 +195,3 @@ def sort_objects(objects, get_id, get_expr): # Return list of sorted objects return [id2obj[id] for id in sorted_ids] - -if __name__ == '__main__': - for i in sort_variables({'x': '1', 'y': 'x+1', 'a': 'x+y', 'b': 'y+1', 'c': 'a+b+x+y'}): - print(i) |