search for: swfdec_as_scop

Hi!, latest git does not compile: rm at eurasia:~/swfdec/swfdec$ make make all-recursive make[1]: Entering directory `/home/rm/swfdec/swfdec' Making all in libswfdec make[2]: Entering directory `/home/rm/swfdec/swfdec/libswfdec' make[2]: *** No rule to make target `swfdec_as_scope.c', needed by `swfdec_asnative.h'. Stop. make[2]: Leaving directory `/home/rm/swfdec/swfdec/libswfdec' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/rm/swfdec/swfdec' make: *** [all] Error 2 So i've tried git-bisect for the first time and that's i...

libswfdec/Makefile.am | 4 libswfdec/swfdec_as_context.c | 39 ++---- libswfdec/swfdec_as_frame.c | 218 ++++++++++++++++++++-------------- libswfdec/swfdec_as_frame_internal.h | 38 ++++- libswfdec/swfdec_as_interpret.c | 39 +++--- libswfdec/swfdec_as_scope.c | 78 ------------ libswfdec/swfdec_as_scope.h | 55 -------- libswfdec/swfdec_as_script_function.c | 10 - libswfdec/swfdec_as_script_function.h | 6 libswfdec/swfdec_as_with.c | 143 ---------------------- libswfdec/swfdec_as_with.h | 56 -...

...ontext.c | 6 libswfdec/swfdec_as_frame.c | 32 ++++- libswfdec/swfdec_as_frame.h | 5 libswfdec/swfdec_as_interpret.c | 33 ++++- libswfdec/swfdec_as_number.c | 7 - libswfdec/swfdec_as_scope.h | 2 libswfdec/swfdec_as_script_function.c | 1 libswfdec/swfdec_as_with.c | 133 +++++++++++++++++++++ libswfdec/swfdec_as_with.h | 56 ++++++++ libswfdec/swfdec_button_movie.c |...

...dex 2bfc151..7cf86f6 100644 --- a/libswfdec/Makefile.am +++ b/libswfdec/Makefile.am @@ -37,9 +37,11 @@ libswfdec_ at SWFDEC_MAJORMINOR@_la_SOURCES swfdec_as_frame.c \ swfdec_as_function.c \ swfdec_as_interpret.c \ + swfdec_as_native_function.c \ swfdec_as_number.c \ swfdec_as_object.c \ swfdec_as_scope.c \ + swfdec_as_script_function.c \ swfdec_as_stack.c \ swfdec_as_strings.c \ swfdec_as_super.c \ @@ -135,9 +137,11 @@ noinst_HEADERS = \ swfdec_as_frame.h \ swfdec_as_function.h \ swfdec_as_interpret.h \ + swfdec_as_native_function.h \ swfdec_as_number.h \ swfdec_as_object.h \ s...

...rame * swfdec_as_script_function_call (SwfdecAsFunction *function) { SwfdecAsScriptFunction *script = SWFDEC_AS_SCRIPT_FUNCTION (function); @@ -38,6 +38,7 @@ swfdec_as_script_function_call (SwfdecAs frame = swfdec_as_frame_new (SWFDEC_AS_OBJECT (function)->context, script->script); SWFDEC_AS_SCOPE (frame)->next = script->scope; frame->scope = SWFDEC_AS_SCOPE (frame); + return frame; } static void diff-tree 9cb22649fde6a503bb6c9be05db5350fcbe538e1 (from 83e3e532b360c88a2cce6b0d389fbf89b10b1279) Author: Benjamin Otte <otte at gnome.org> Date: Tue May 22 12:49:52 2007...

...nction_call (SwfdecAsFunction *function) { SwfdecAsScriptFunction *script = SWFDEC_AS_SCRIPT_FUNCTION (function); SwfdecAsFrame *frame; - frame = swfdec_as_frame_new (thisp, script->script); + frame = swfdec_as_frame_new (SWFDEC_AS_OBJECT (function)->context, script->script); SWFDEC_AS_SCOPE (frame)->next = script->scope; frame->scope = SWFDEC_AS_SCOPE (frame); }

...wfdec_as_script_function.c index 9278ffe..14873d1 100644 --- a/libswfdec/swfdec_as_script_function.c +++ b/libswfdec/swfdec_as_script_function.c @@ -38,6 +38,7 @@ swfdec_as_script_function_call (SwfdecAs frame = swfdec_as_frame_new (SWFDEC_AS_OBJECT (function)->context, script->script); SWFDEC_AS_SCOPE (frame)->next = script->scope; frame->scope = SWFDEC_AS_SCOPE (frame); + frame->function = function; return frame; } diff-tree e62297aa4f0430285e9350049bf06cd4163a831f (from eff27731c8ce11922acc4c925c98188d9049296c) Author: Benjamin Otte <otte at gnome.org> Date: Thu...

...ec_action_define_function (SwfdecAsC SWFDEC_ERROR ("could not parse function name"); return; } - /* see function-scope tests */ - if (cx->version > 5) { - /* FIXME: or original target? */ - fun = swfdec_as_script_function_new (frame->scope ? frame->scope : SWFDEC_AS_SCOPE (frame), frame->target); - } else { - SwfdecAsScope *scope = frame->scope ? frame->scope : SWFDEC_AS_SCOPE (frame); - while (scope->next) - scope = scope->next; - fun = swfdec_as_script_function_new (scope, frame->target); - } - if (fun == NULL) - return; n...

...if (frame->function) swfdec_as_object_mark (SWFDEC_AS_OBJECT (frame->function)); for (i = 0; i < frame->n_registers; i++) { @@ -124,8 +121,6 @@ swfdec_as_frame_new (SwfdecAsContext *co frame->pc = script->buffer->data; frame->stack = stack; frame->scope = SWFDEC_AS_SCOPE (frame); - if (frame->next) - frame->var_object = frame->next->var_object; frame->n_registers = script->n_registers; frame->registers = g_slice_alloc0 (sizeof (SwfdecAsValue) * frame->n_registers); if (script->constant_pool) { @@ -176,8 +171,10 @@ swfdec_as_...

...return frame->next; +} + diff --git a/libswfdec/swfdec_as_frame.h b/libswfdec/swfdec_as_frame.h index 6a8197a..b5d632e 100644 --- a/libswfdec/swfdec_as_frame.h +++ b/libswfdec/swfdec_as_frame.h @@ -20,9 +20,7 @@ #ifndef _SWFDEC_AS_FRAME_H_ #define _SWFDEC_AS_FRAME_H_ -#include <libswfdec/swfdec_as_scope.h> #include <libswfdec/swfdec_as_types.h> -#include <libswfdec/swfdec_script.h> G_BEGIN_DECLS @@ -45,62 +43,14 @@ struct _SwfdecAsStackIterator { #define SWFDEC_AS_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SWFDEC_TYPE_AS_FRAME, SwfdecAsFrameClass)) #de...

...T_GET_CLASS +SWFDEC_IS_AS_OBJECT +SWFDEC_IS_AS_OBJECT_CLASS +SWFDEC_TYPE_AS_OBJECT +</SECTION> diff-tree dc507c661ecefe5cc761ae5119922bec50b647a4 (from 5cc02fe654a0fbaab833d064437888313c8a6704) Author: Benjamin Otte <otte at gnome.org> Date: Thu Jul 12 23:24:23 2007 +0200 exclude swfdec_as_scope.h diff --git a/doc/Makefile.am b/doc/Makefile.am index 0b9b85d..540729e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -59,6 +59,7 @@ IGNORE_HFILES= \ swfdec_as_interpret.h \ swfdec_as_math.h \ swfdec_as_number.h \ + swfdec_as_scope.h \ swfdec_as_stack.h \ swfdec_as_string.h \...

...<otte at gnome.org> Date: Fri Jul 13 17:24:59 2007 +0200 add functions to the docs diff --git a/doc/Makefile.am b/doc/Makefile.am index 1a3e287..03bc0da 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -61,6 +61,7 @@ IGNORE_HFILES= \ swfdec_as_math.h \ swfdec_as_number.h \ swfdec_as_scope.h \ + swfdec_as_script_function.h \ swfdec_as_stack.h \ swfdec_as_string.h \ swfdec_as_strings.h \ diff --git a/doc/swfdec-docs.sgml b/doc/swfdec-docs.sgml index 2c7787f..553dfb1 100644 --- a/doc/swfdec-docs.sgml +++ b/doc/swfdec-docs.sgml @@ -27,5 +27,6 @@ <xi:include href="xml...

...types.h \ swfdec_audio.h \ @@ -147,11 +149,9 @@ noinst_HEADERS = \ swfdec_as_array.h \ swfdec_as_boolean.h \ swfdec_as_frame_internal.h \ - swfdec_as_function.h \ swfdec_as_internal.h \ swfdec_as_interpret.h \ swfdec_as_math.h \ - swfdec_as_native_function.h \ swfdec_as_number.h \ swfdec_as_scope.h \ swfdec_as_script_function.h \ diff-tree 7cc61118ddf98319b1641013587b505affc01300 (from b8865e69f74f00f1c2b373003900b24592df341b) Author: Benjamin Otte <otte at gnome.org> Date: Tue Aug 14 14:48:38 2007 +0200 These two files were missing in the headers diff --git a/libswfdec/swf...

....h> #include <libswfdec/swfdec_buffer.h> diff --git a/libswfdec/swfdec_as_frame_internal.h b/libswfdec/swfdec_as_frame_internal.h index f6d7644..4f613b4 100644 --- a/libswfdec/swfdec_as_frame_internal.h +++ b/libswfdec/swfdec_as_frame_internal.h @@ -22,7 +22,7 @@ #include <libswfdec/swfdec_as_scope.h> #include <libswfdec/swfdec_as_types.h> -#include <libswfdec/swfdec_script.h> +#include <libswfdec/swfdec_script_internal.h> G_BEGIN_DECLS diff --git a/libswfdec/swfdec_as_internal.h b/libswfdec/swfdec_as_internal.h index ca6ab2d..5906ef4 100644 --- a/libswfdec/swfdec_...

...ec_action_define_function (SwfdecAsC SWFDEC_ERROR ("could not parse function name"); return; } - /* see function-scope tests */ - if (cx->version > 5) { - /* FIXME: or original target? */ - fun = swfdec_as_script_function_new (frame->scope ? frame->scope : SWFDEC_AS_SCOPE (frame), frame->target); - } else { - SwfdecAsScope *scope = frame->scope ? frame->scope : SWFDEC_AS_SCOPE (frame); - while (scope->next) - scope = scope->next; - fun = swfdec_as_script_function_new (scope, frame->target); - } - if (fun == NULL) - return; n...

...wfdec/swfdec_as_script_function.c +++ b/libswfdec/swfdec_as_script_function.c @@ -36,6 +36,8 @@ swfdec_as_script_function_call (SwfdecAs SwfdecAsFrame *frame; frame = swfdec_as_frame_new (SWFDEC_AS_OBJECT (function)->context, script->script); + if (frame == NULL) + return NULL; SWFDEC_AS_SCOPE (frame)->next = script->scope; frame->function = function; frame->target = script->target; diff-tree 2e1af44affe8e070f1f649c5f36fb922015a003f (from 83a8cc868639af2df66fc30cf0b31dcba6858849) Author: Benjamin Otte <otte at gnome.org> Date: Sun Jul 1 00:26:56 2007 +0100...

...s_number.c | 72 libswfdec/swfdec_as_number.h | 3 libswfdec/swfdec_as_object.c | 437 libswfdec/swfdec_as_object.h | 8 libswfdec/swfdec_as_scope.c | 78 libswfdec/swfdec_as_script_function.c | 10 libswfdec/swfdec_as_script_function.h | 8 libswfdec/swfdec_as_stack.h | 14 libswfdec/swfdec...