Skip to content

Commit 742c2cf

Browse files
committed
[gyb] replace #line with #setline in default arguments and examples
1 parent fbac133 commit 742c2cf

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

utils/gyb.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ def next_token(self):
529529
class ExecutionContext:
530530
"""State we pass around during execution of a template"""
531531

532-
def __init__(self, line_directive='// ###line', **local_bindings):
532+
def __init__(self, line_directive='// ###setline', **local_bindings):
533533
self.local_bindings = local_bindings
534534
self.line_directive = line_directive
535535
self.local_bindings['__context__'] = self
@@ -955,14 +955,14 @@ def execute_template(ast, line_directive='', **local_bindings):
955955
... % else:
956956
... THIS SHOULD NOT APPEAR IN THE OUTPUT
957957
... ''')
958-
>>> print execute_template(ast, line_directive='//#line', x=1),
959-
//#line 1 "/dummy.file"
958+
>>> print execute_template(ast, line_directive='//#setline', x=1),
959+
//#setline 1 "/dummy.file"
960960
Nothing
961-
//#line 4 "/dummy.file"
961+
//#setline 4 "/dummy.file"
962962
0
963-
//#line 4 "/dummy.file"
963+
//#setline 4 "/dummy.file"
964964
1
965-
//#line 4 "/dummy.file"
965+
//#setline 4 "/dummy.file"
966966
2
967967
968968
>>> ast = parse_template('/dummy.file', text=
@@ -973,10 +973,10 @@ def execute_template(ast, line_directive='', **local_bindings):
973973
... % end
974974
... ${a}
975975
... ''')
976-
>>> print execute_template(ast, line_directive='//#line', x=1),
977-
//#line 1 "/dummy.file"
976+
>>> print execute_template(ast, line_directive='//#setline', x=1),
977+
//#setline 1 "/dummy.file"
978978
Nothing
979-
//#line 6 "/dummy.file"
979+
//#setline 6 "/dummy.file"
980980
[0, 1, 2]
981981
"""
982982
executionContext = ExecutionContext(line_directive=line_directive, **local_bindings)
@@ -1059,7 +1059,7 @@ def succ(a):
10591059
parser.add_argument('--test', action='store_true', default=False, help='Run a self-test')
10601060
parser.add_argument('--verbose-test', action='store_true', default=False, help='Run a verbose self-test')
10611061
parser.add_argument('--dump', action='store_true', default=False, help='Dump the parsed template to stdout')
1062-
parser.add_argument('--line-directive', default='// ###line', help='Line directive prefix; empty => no line markers')
1062+
parser.add_argument('--line-directive', default='// ###setline', help='Line directive prefix; empty => no line markers')
10631063

10641064
args = parser.parse_args(sys.argv[1:])
10651065

0 commit comments

Comments
 (0)