fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-02-04 04:50:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[script] Preserve '{}' whilst translating

Browse source
This commit is contained in:
Chris Wilson 2009-08-11 21:26:11 +01:00
parent 24b2320002
commit cbee97f0e3
2 changed files with 41 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
util/cairo-script/cairo-script-private.h
View file

@ -428,6 +428,7 @@ struct _csi_scanner {
jmp_buf jmpbuf;
int depth;
int bind;
csi_status_t (*push) (csi_t *ctx, csi_object_t *obj);
csi_status_t (*execute) (csi_t *ctx, csi_object_t *obj);
void *closure;

75
util/cairo-script/cairo-script-scanner.c
View file

@ -411,44 +411,46 @@ token_end (csi_t *ctx, csi_scanner_t *scan, csi_file_t *src)
s = scan->buffer.base;
len = scan->buffer.ptr - scan->buffer.base;
if (s[0] == '{') { /* special case procedures */
if (scan->build_procedure.type != CSI_OBJECT_TYPE_NULL) {
status = _csi_stack_push (ctx,
&scan->procedure_stack,
&scan->build_procedure);
if (_csi_likely (! scan->bind)) {
if (s[0] == '{') { /* special case procedures */
if (scan->build_procedure.type != CSI_OBJECT_TYPE_NULL) {
status = _csi_stack_push (ctx,
&scan->procedure_stack,
&scan->build_procedure);
if (_csi_unlikely (status))
longjmp (scan->jmpbuf, status);
}
status = csi_array_new (ctx, 0, &scan->build_procedure);
if (_csi_unlikely (status))
longjmp (scan->jmpbuf, status);
scan->build_procedure.type |= CSI_OBJECT_ATTR_EXECUTABLE;
return;
} else if (s[0] == '}') {
if (_csi_unlikely
(scan->build_procedure.type == CSI_OBJECT_TYPE_NULL))
{
longjmp (scan->jmpbuf, _csi_error (CSI_STATUS_INVALID_SCRIPT));
}
if (scan->procedure_stack.len) {
csi_object_t *next;
next = _csi_stack_peek (&scan->procedure_stack, 0);
status = csi_array_append (ctx, next->datum.array,
&scan->build_procedure);
scan->build_procedure = *next;
scan->procedure_stack.len--;
} else {
status = scan_push (ctx, &scan->build_procedure);
scan->build_procedure.type = CSI_OBJECT_TYPE_NULL;
}
if (_csi_unlikely (status))
longjmp (scan->jmpbuf, status);
return;
}
status = csi_array_new (ctx, 0, &scan->build_procedure);
if (_csi_unlikely (status))
longjmp (scan->jmpbuf, status);
scan->build_procedure.type |= CSI_OBJECT_ATTR_EXECUTABLE;
return;
} else if (s[0] == '}') {
if (_csi_unlikely
(scan->build_procedure.type == CSI_OBJECT_TYPE_NULL))
{
longjmp (scan->jmpbuf, _csi_error (CSI_STATUS_INVALID_SCRIPT));
}
if (scan->procedure_stack.len) {
csi_object_t *next;
next = _csi_stack_peek (&scan->procedure_stack, 0);
status = csi_array_append (ctx, next->datum.array,
&scan->build_procedure);
scan->build_procedure = *next;
scan->procedure_stack.len--;
} else {
status = scan_push (ctx, &scan->build_procedure);
scan->build_procedure.type = CSI_OBJECT_TYPE_NULL;
}
if (_csi_unlikely (status))
longjmp (scan->jmpbuf, status);
return;
}
if (s[0] == '/') {
@ -1238,6 +1240,7 @@ _csi_scanner_init (csi_t *ctx, csi_scanner_t *scanner)
if (status)
return status;
scanner->bind = 0;
scanner->push = _scan_push;
scanner->execute = _scan_execute;
@ -1663,11 +1666,13 @@ _csi_translate_file (csi_t *ctx,
translator.closure = closure;
ctx->scanner.closure = &translator;
ctx->scanner.bind = 1;
ctx->scanner.push = _translate_push;
ctx->scanner.execute = _translate_execute;
_scan_file (ctx, file);
ctx->scanner.bind = 0;
ctx->scanner.push = _scan_push;
ctx->scanner.execute = _scan_execute;