[gimp] plug-ins: imagemap, tabs to spaces
- From: Mikael Magnusson <mikachu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] plug-ins: imagemap, tabs to spaces
- Date: Wed, 23 Feb 2011 12:17:56 +0000 (UTC)
commit e012caf1a3ed3f1b8294765c896817327da3e15f
Author: Mikael Magnusson <mikachu src gnome org>
Date: Mon Feb 21 11:51:47 2011 +0100
plug-ins: imagemap, tabs to spaces
plug-ins/imagemap/imap_browse.c | 26 +-
plug-ins/imagemap/imap_cern_lex.c | 1642 ++++++++++++++--------------
plug-ins/imagemap/imap_cern_parse.c | 554 +++++-----
plug-ins/imagemap/imap_cern_parse.h | 2 +-
plug-ins/imagemap/imap_circle.c | 44 +-
plug-ins/imagemap/imap_cmd_clear.c | 12 +-
plug-ins/imagemap/imap_cmd_copy.c | 6 +-
plug-ins/imagemap/imap_cmd_copy_object.c | 8 +-
plug-ins/imagemap/imap_cmd_create.c | 8 +-
plug-ins/imagemap/imap_cmd_cut.c | 8 +-
plug-ins/imagemap/imap_cmd_cut_object.c | 8 +-
plug-ins/imagemap/imap_cmd_delete.c | 8 +-
plug-ins/imagemap/imap_cmd_delete_point.c | 16 +-
plug-ins/imagemap/imap_cmd_edit_object.c | 4 +-
plug-ins/imagemap/imap_cmd_gimp_guides.c | 68 +-
plug-ins/imagemap/imap_cmd_guides.c | 56 +-
plug-ins/imagemap/imap_cmd_insert_point.c | 20 +-
plug-ins/imagemap/imap_cmd_move.c | 10 +-
plug-ins/imagemap/imap_cmd_move_down.c | 10 +-
plug-ins/imagemap/imap_cmd_move_sash.c | 14 +-
plug-ins/imagemap/imap_cmd_move_selected.c | 6 +-
plug-ins/imagemap/imap_cmd_move_to_front.c | 12 +-
plug-ins/imagemap/imap_cmd_move_up.c | 8 +-
plug-ins/imagemap/imap_cmd_object_down.c | 4 +-
plug-ins/imagemap/imap_cmd_object_move.c | 4 +-
plug-ins/imagemap/imap_cmd_object_up.c | 4 +-
plug-ins/imagemap/imap_cmd_paste.c | 8 +-
plug-ins/imagemap/imap_cmd_select.c | 2 +-
plug-ins/imagemap/imap_cmd_select_all.c | 8 +-
plug-ins/imagemap/imap_cmd_select_next.c | 8 +-
plug-ins/imagemap/imap_cmd_select_prev.c | 8 +-
plug-ins/imagemap/imap_cmd_select_region.c | 28 +-
plug-ins/imagemap/imap_cmd_send_to_back.c | 12 +-
plug-ins/imagemap/imap_cmd_unselect.c | 4 +-
plug-ins/imagemap/imap_cmd_unselect_all.c | 8 +-
plug-ins/imagemap/imap_command.c | 50 +-
plug-ins/imagemap/imap_command.h | 10 +-
plug-ins/imagemap/imap_commands.h | 6 +-
plug-ins/imagemap/imap_csim_lex.c | 1692 ++++++++++++++--------------
plug-ins/imagemap/imap_csim_parse.c | 726 ++++++------
plug-ins/imagemap/imap_csim_parse.h | 2 +-
plug-ins/imagemap/imap_default_dialog.c | 12 +-
plug-ins/imagemap/imap_default_dialog.h | 32 +-
plug-ins/imagemap/imap_edit_area_info.c | 42 +-
plug-ins/imagemap/imap_edit_area_info.h | 52 +-
plug-ins/imagemap/imap_file.c | 4 +-
plug-ins/imagemap/imap_grid.c | 16 +-
plug-ins/imagemap/imap_main.c | 8 +-
plug-ins/imagemap/imap_main.h | 10 +-
plug-ins/imagemap/imap_menu.c | 32 +-
plug-ins/imagemap/imap_menu.h | 2 +-
plug-ins/imagemap/imap_menu_funcs.c | 8 +-
plug-ins/imagemap/imap_menu_funcs.h | 6 +-
plug-ins/imagemap/imap_misc.c | 2 +-
plug-ins/imagemap/imap_mru.c | 4 +-
plug-ins/imagemap/imap_mru.h | 2 +-
plug-ins/imagemap/imap_ncsa_lex.c | 1676 ++++++++++++++--------------
plug-ins/imagemap/imap_ncsa_parse.c | 570 +++++-----
plug-ins/imagemap/imap_ncsa_parse.h | 2 +-
plug-ins/imagemap/imap_object.c | 196 ++--
plug-ins/imagemap/imap_object.h | 92 +-
plug-ins/imagemap/imap_object_popup.c | 6 +-
plug-ins/imagemap/imap_object_popup.h | 2 +-
plug-ins/imagemap/imap_polygon.c | 86 +-
plug-ins/imagemap/imap_preferences.c | 128 ++--
plug-ins/imagemap/imap_preferences.h | 28 +-
plug-ins/imagemap/imap_preview.c | 192 ++--
plug-ins/imagemap/imap_preview.h | 14 +-
plug-ins/imagemap/imap_rectangle.c | 74 +-
plug-ins/imagemap/imap_selection.c | 72 +-
plug-ins/imagemap/imap_selection.h | 22 +-
plug-ins/imagemap/imap_settings.c | 36 +-
plug-ins/imagemap/imap_source.c | 6 +-
plug-ins/imagemap/imap_statusbar.c | 18 +-
plug-ins/imagemap/imap_stock.c | 12 +-
plug-ins/imagemap/imap_table.c | 6 +-
plug-ins/imagemap/imap_table.h | 12 +-
plug-ins/imagemap/imap_taglist.c | 4 +-
78 files changed, 4310 insertions(+), 4310 deletions(-)
---
diff --git a/plug-ins/imagemap/imap_browse.c b/plug-ins/imagemap/imap_browse.c
index 49df3ed..86addc1 100644
--- a/plug-ins/imagemap/imap_browse.c
+++ b/plug-ins/imagemap/imap_browse.c
@@ -66,14 +66,14 @@ browse_cb (GtkWidget *widget,
GtkWidget *dialog;
dialog = browse->file_chooser =
- gtk_file_chooser_dialog_new (browse->name,
- GTK_WINDOW (gtk_widget_get_toplevel (widget)),
- GTK_FILE_CHOOSER_ACTION_OPEN,
+ gtk_file_chooser_dialog_new (browse->name,
+ GTK_WINDOW (gtk_widget_get_toplevel (widget)),
+ GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN, GTK_RESPONSE_OK,
- NULL);
+ NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK,
@@ -83,8 +83,8 @@ browse_cb (GtkWidget *widget,
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
g_signal_connect (dialog, "destroy",
- G_CALLBACK (gtk_widget_destroyed),
- &dialog);
+ G_CALLBACK (gtk_widget_destroyed),
+ &dialog);
g_signal_connect (dialog, "response",
G_CALLBACK (select_cb),
browse);
@@ -94,7 +94,7 @@ browse_cb (GtkWidget *widget,
static void
handle_drop(GtkWidget *widget, GdkDragContext *context, gint x, gint y,
- GtkSelectionData *data, guint info, guint time)
+ GtkSelectionData *data, guint info, guint time)
{
gboolean success = FALSE;
@@ -130,9 +130,9 @@ browse_widget_new (const gchar *name)
browse->file = gtk_entry_new ();
gtk_box_pack_start (GTK_BOX(browse->hbox), browse->file, TRUE, TRUE, 0);
gtk_drag_dest_set (browse->file, GTK_DEST_DEFAULT_ALL, target_table,
- 2, GDK_ACTION_COPY);
+ 2, GDK_ACTION_COPY);
g_signal_connect (browse->file, "drag-data-received",
- G_CALLBACK(handle_drop), NULL);
+ G_CALLBACK(handle_drop), NULL);
gtk_widget_show (browse->file);
@@ -143,7 +143,7 @@ browse_widget_new (const gchar *name)
gtk_box_pack_end(GTK_BOX (browse->hbox), button, FALSE, FALSE, 0);
g_signal_connect (button, "clicked",
- G_CALLBACK(browse_cb), (gpointer) browse);
+ G_CALLBACK(browse_cb), (gpointer) browse);
gtk_widget_show (button);
return browse;
@@ -157,7 +157,7 @@ browse_widget_set_filename(BrowseWidget_t *browse, const gchar *filename)
void
browse_widget_set_filter(BrowseWidget_t *browse, BrowseFilter_t filter,
- gpointer data)
+ gpointer data)
{
browse->filter = filter;
browse->filter_data = data;
diff --git a/plug-ins/imagemap/imap_cern_lex.c b/plug-ins/imagemap/imap_cern_lex.c
index 04a7329..e486594 100644
--- a/plug-ins/imagemap/imap_cern_lex.c
+++ b/plug-ins/imagemap/imap_cern_lex.c
@@ -111,15 +111,15 @@ typedef unsigned int flex_uint32_t;
/* The "const" storage-class-modifier is valid. */
#define YY_USE_CONST
-#else /* ! __cplusplus */
+#else /* ! __cplusplus */
/* C99 requires __STDC__ to be defined as 1. */
#if defined (__STDC__)
#define YY_USE_CONST
-#endif /* defined (__STDC__) */
-#endif /* ! __cplusplus */
+#endif /* defined (__STDC__) */
+#endif /* ! __cplusplus */
#ifdef YY_USE_CONST
#define yyconst const
@@ -192,17 +192,17 @@ extern FILE *cern_in, *cern_out;
/* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \
- do \
- { \
- /* Undo effects of setting up cern_text. */ \
+ do \
+ { \
+ /* Undo effects of setting up cern_text. */ \
int yyless_macro_arg = (n); \
YY_LESS_LINENO(yyless_macro_arg);\
- *yy_cp = (yy_hold_char); \
- YY_RESTORE_YY_MORE_OFFSET \
- (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
- YY_DO_BEFORE_ACTION; /* set up cern_text again */ \
- } \
- while ( 0 )
+ *yy_cp = (yy_hold_char); \
+ YY_RESTORE_YY_MORE_OFFSET \
+ (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+ YY_DO_BEFORE_ACTION; /* set up cern_text again */ \
+ } \
+ while ( 0 )
#define unput(c) yyunput( c, (yytext_ptr) )
@@ -214,66 +214,66 @@ typedef size_t yy_size_t;
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
- {
- FILE *yy_input_file;
-
- char *yy_ch_buf; /* input buffer */
- char *yy_buf_pos; /* current position in input buffer */
-
- /* Size of input buffer in bytes, not including room for EOB
- * characters.
- */
- yy_size_t yy_buf_size;
-
- /* Number of characters read into yy_ch_buf, not including EOB
- * characters.
- */
- int yy_n_chars;
-
- /* Whether we "own" the buffer - i.e., we know we created it,
- * and can realloc() it to grow it, and should free() it to
- * delete it.
- */
- int yy_is_our_buffer;
-
- /* Whether this is an "interactive" input source; if so, and
- * if we're using stdio for input, then we want to use getc()
- * instead of fread(), to make sure we stop fetching input after
- * each newline.
- */
- int yy_is_interactive;
-
- /* Whether we're considered to be at the beginning of a line.
- * If so, '^' rules will be active on the next match, otherwise
- * not.
- */
- int yy_at_bol;
+ {
+ FILE *yy_input_file;
+
+ char *yy_ch_buf; /* input buffer */
+ char *yy_buf_pos; /* current position in input buffer */
+
+ /* Size of input buffer in bytes, not including room for EOB
+ * characters.
+ */
+ yy_size_t yy_buf_size;
+
+ /* Number of characters read into yy_ch_buf, not including EOB
+ * characters.
+ */
+ int yy_n_chars;
+
+ /* Whether we "own" the buffer - i.e., we know we created it,
+ * and can realloc() it to grow it, and should free() it to
+ * delete it.
+ */
+ int yy_is_our_buffer;
+
+ /* Whether this is an "interactive" input source; if so, and
+ * if we're using stdio for input, then we want to use getc()
+ * instead of fread(), to make sure we stop fetching input after
+ * each newline.
+ */
+ int yy_is_interactive;
+
+ /* Whether we're considered to be at the beginning of a line.
+ * If so, '^' rules will be active on the next match, otherwise
+ * not.
+ */
+ int yy_at_bol;
int yy_bs_lineno; /**< The line count. */
int yy_bs_column; /**< The column count. */
- /* Whether to try to fill the input buffer when we reach the
- * end of it.
- */
- int yy_fill_buffer;
+ /* Whether to try to fill the input buffer when we reach the
+ * end of it.
+ */
+ int yy_fill_buffer;
- int yy_buffer_status;
+ int yy_buffer_status;
#define YY_BUFFER_NEW 0
#define YY_BUFFER_NORMAL 1
- /* When an EOF's been seen but there's still some text to process
- * then we mark the buffer as YY_EOF_PENDING, to indicate that we
- * shouldn't try reading from the input source any more. We might
- * still have a bunch of tokens to match, though, because of
- * possible backing-up.
- *
- * When we actually see the EOF, we change the status to "new"
- * (via cern_restart()), so that the user can continue scanning by
- * just pointing cern_in at a new input file.
- */
+ /* When an EOF's been seen but there's still some text to process
+ * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+ * shouldn't try reading from the input source any more. We might
+ * still have a bunch of tokens to match, though, because of
+ * possible backing-up.
+ *
+ * When we actually see the EOF, we change the status to "new"
+ * (via cern_restart()), so that the user can continue scanning by
+ * just pointing cern_in at a new input file.
+ */
#define YY_BUFFER_EOF_PENDING 2
- };
+ };
#endif /* !YY_STRUCT_YY_BUFFER_STATE */
/* Stack of input buffers. */
@@ -298,13 +298,13 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
/* yy_hold_char holds the character lost when cern_text is formed. */
static char yy_hold_char;
-static int yy_n_chars; /* number of characters read into yy_ch_buf */
+static int yy_n_chars; /* number of characters read into yy_ch_buf */
int cern_leng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 0; /* whether we need to initialize */
-static int yy_start = 0; /* start state number */
+static int yy_init = 0; /* whether we need to initialize */
+static int yy_start = 0; /* start state number */
/* Flag which is used to allow cern_wrap()'s to do buffer switches
* instead of setting up a fresh cern_in. A bit of a hack ...
@@ -336,24 +336,24 @@ void cern_free (void * );
#define yy_new_buffer cern__create_buffer
#define yy_set_interactive(is_interactive) \
- { \
- if ( ! YY_CURRENT_BUFFER ){ \
+ { \
+ if ( ! YY_CURRENT_BUFFER ){ \
cern_ensure_buffer_stack (); \
- YY_CURRENT_BUFFER_LVALUE = \
+ YY_CURRENT_BUFFER_LVALUE = \
cern__create_buffer(cern_in,YY_BUF_SIZE ); \
- } \
- YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
- }
+ } \
+ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+ }
#define yy_set_bol(at_bol) \
- { \
- if ( ! YY_CURRENT_BUFFER ){\
+ { \
+ if ( ! YY_CURRENT_BUFFER ){\
cern_ensure_buffer_stack (); \
- YY_CURRENT_BUFFER_LVALUE = \
+ YY_CURRENT_BUFFER_LVALUE = \
cern__create_buffer(cern_in,YY_BUF_SIZE ); \
- } \
- YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
- }
+ } \
+ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+ }
#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
@@ -384,21 +384,21 @@ static void yy_fatal_error (yyconst char msg[] );
* corresponding action - sets up cern_text.
*/
#define YY_DO_BEFORE_ACTION \
- (yytext_ptr) = yy_bp; \
- cern_leng = (size_t) (yy_cp - yy_bp); \
- (yy_hold_char) = *yy_cp; \
- *yy_cp = '\0'; \
- (yy_c_buf_p) = yy_cp;
+ (yytext_ptr) = yy_bp; \
+ cern_leng = (size_t) (yy_cp - yy_bp); \
+ (yy_hold_char) = *yy_cp; \
+ *yy_cp = '\0'; \
+ (yy_c_buf_p) = yy_cp;
#define YY_NUM_RULES 13
#define YY_END_OF_BUFFER 14
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
- {
- flex_int32_t yy_verify;
- flex_int32_t yy_nxt;
- };
+ {
+ flex_int32_t yy_verify;
+ flex_int32_t yy_nxt;
+ };
static yyconst flex_int16_t yy_accept[94] =
{ 0,
10, 10, 0, 0, 14, 12, 11, 11, 12, 10,
@@ -723,33 +723,33 @@ static int input (void );
*/
#ifndef YY_INPUT
#define YY_INPUT(buf,result,max_size) \
- if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
- { \
- int c = '*'; \
- size_t n; \
- for ( n = 0; n < max_size && \
- (c = getc( cern_in )) != EOF && c != '\n'; ++n ) \
- buf[n] = (char) c; \
- if ( c == '\n' ) \
- buf[n++] = (char) c; \
- if ( c == EOF && ferror( cern_in ) ) \
- YY_FATAL_ERROR( "input in flex scanner failed" ); \
- result = n; \
- } \
- else \
- { \
- errno=0; \
- while ( (result = fread(buf, 1, max_size, cern_in))==0 && ferror(cern_in)) \
- { \
- if( errno != EINTR) \
- { \
- YY_FATAL_ERROR( "input in flex scanner failed" ); \
- break; \
- } \
- errno=0; \
- clearerr(cern_in); \
- } \
- }\
+ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+ { \
+ int c = '*'; \
+ size_t n; \
+ for ( n = 0; n < max_size && \
+ (c = getc( cern_in )) != EOF && c != '\n'; ++n ) \
+ buf[n] = (char) c; \
+ if ( c == '\n' ) \
+ buf[n++] = (char) c; \
+ if ( c == EOF && ferror( cern_in ) ) \
+ YY_FATAL_ERROR( "input in flex scanner failed" ); \
+ result = n; \
+ } \
+ else \
+ { \
+ errno=0; \
+ while ( (result = fread(buf, 1, max_size, cern_in))==0 && ferror(cern_in)) \
+ { \
+ if( errno != EINTR) \
+ { \
+ YY_FATAL_ERROR( "input in flex scanner failed" ); \
+ break; \
+ } \
+ errno=0; \
+ clearerr(cern_in); \
+ } \
+ }\
\
#endif
@@ -798,129 +798,129 @@ extern int cern_lex (void);
#endif
#define YY_RULE_SETUP \
- YY_USER_ACTION
+ YY_USER_ACTION
/** The main scanner function which does all the work.
*/
YY_DECL
{
- register yy_state_type yy_current_state;
- register char *yy_cp, *yy_bp;
- register int yy_act;
+ register yy_state_type yy_current_state;
+ register char *yy_cp, *yy_bp;
+ register int yy_act;
#line 44 "imap_cern.l"
#line 815 "<stdout>"
- if ( !(yy_init) )
- {
- (yy_init) = 1;
+ if ( !(yy_init) )
+ {
+ (yy_init) = 1;
#ifdef YY_USER_INIT
- YY_USER_INIT;
+ YY_USER_INIT;
#endif
- if ( ! (yy_start) )
- (yy_start) = 1; /* first start state */
+ if ( ! (yy_start) )
+ (yy_start) = 1; /* first start state */
- if ( ! cern_in )
- cern_in = stdin;
+ if ( ! cern_in )
+ cern_in = stdin;
- if ( ! cern_out )
- cern_out = stdout;
+ if ( ! cern_out )
+ cern_out = stdout;
- if ( ! YY_CURRENT_BUFFER ) {
- cern_ensure_buffer_stack ();
- YY_CURRENT_BUFFER_LVALUE =
- cern__create_buffer(cern_in,YY_BUF_SIZE );
- }
+ if ( ! YY_CURRENT_BUFFER ) {
+ cern_ensure_buffer_stack ();
+ YY_CURRENT_BUFFER_LVALUE =
+ cern__create_buffer(cern_in,YY_BUF_SIZE );
+ }
- cern__load_buffer_state( );
- }
+ cern__load_buffer_state( );
+ }
- while ( 1 ) /* loops until end-of-file is reached */
- {
- yy_cp = (yy_c_buf_p);
+ while ( 1 ) /* loops until end-of-file is reached */
+ {
+ yy_cp = (yy_c_buf_p);
- /* Support of cern_text. */
- *yy_cp = (yy_hold_char);
+ /* Support of cern_text. */
+ *yy_cp = (yy_hold_char);
- /* yy_bp points to the position in yy_ch_buf of the start of
- * the current run.
- */
- yy_bp = yy_cp;
+ /* yy_bp points to the position in yy_ch_buf of the start of
+ * the current run.
+ */
+ yy_bp = yy_cp;
- yy_current_state = (yy_start);
+ yy_current_state = (yy_start);
yy_match:
- do
- {
- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
- if ( yy_accept[yy_current_state] )
- {
- (yy_last_accepting_state) = yy_current_state;
- (yy_last_accepting_cpos) = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 94 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- ++yy_cp;
- }
- while ( yy_base[yy_current_state] != 309 );
+ do
+ {
+ register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+ if ( yy_accept[yy_current_state] )
+ {
+ (yy_last_accepting_state) = yy_current_state;
+ (yy_last_accepting_cpos) = yy_cp;
+ }
+ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ {
+ yy_current_state = (int) yy_def[yy_current_state];
+ if ( yy_current_state >= 94 )
+ yy_c = yy_meta[(unsigned int) yy_c];
+ }
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ ++yy_cp;
+ }
+ while ( yy_base[yy_current_state] != 309 );
yy_find_action:
- yy_act = yy_accept[yy_current_state];
- if ( yy_act == 0 )
- { /* have to back up */
- yy_cp = (yy_last_accepting_cpos);
- yy_current_state = (yy_last_accepting_state);
- yy_act = yy_accept[yy_current_state];
- }
-
- YY_DO_BEFORE_ACTION;
-
-do_action: /* This label is used only to access EOF actions. */
-
- switch ( yy_act )
- { /* beginning of action switch */
- case 0: /* must back up */
- /* undo the effects of YY_DO_BEFORE_ACTION */
- *yy_cp = (yy_hold_char);
- yy_cp = (yy_last_accepting_cpos);
- yy_current_state = (yy_last_accepting_state);
- goto yy_find_action;
+ yy_act = yy_accept[yy_current_state];
+ if ( yy_act == 0 )
+ { /* have to back up */
+ yy_cp = (yy_last_accepting_cpos);
+ yy_current_state = (yy_last_accepting_state);
+ yy_act = yy_accept[yy_current_state];
+ }
+
+ YY_DO_BEFORE_ACTION;
+
+do_action: /* This label is used only to access EOF actions. */
+
+ switch ( yy_act )
+ { /* beginning of action switch */
+ case 0: /* must back up */
+ /* undo the effects of YY_DO_BEFORE_ACTION */
+ *yy_cp = (yy_hold_char);
+ yy_cp = (yy_last_accepting_cpos);
+ yy_current_state = (yy_last_accepting_state);
+ goto yy_find_action;
case 1:
/* rule 1 can match eol */
YY_RULE_SETUP
#line 46 "imap_cern.l"
{
- BEGIN(comment);
- return AUTHOR;
- }
- YY_BREAK
+ BEGIN(comment);
+ return AUTHOR;
+ }
+ YY_BREAK
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
#line 51 "imap_cern.l"
{
- BEGIN(comment);
- return DESCRIPTION;
- }
- YY_BREAK
+ BEGIN(comment);
+ return DESCRIPTION;
+ }
+ YY_BREAK
case 3:
/* rule 3 can match eol */
YY_RULE_SETUP
#line 56 "imap_cern.l"
{
- BEGIN(comment);
- return BEGIN_COMMENT;
- }
- YY_BREAK
+ BEGIN(comment);
+ return BEGIN_COMMENT;
+ }
+ YY_BREAK
case 4:
*yy_cp = (yy_hold_char); /* undo effects of setting up cern_text */
(yy_c_buf_p) = yy_cp -= 1;
@@ -928,31 +928,31 @@ YY_DO_BEFORE_ACTION; /* set up cern_text again */
YY_RULE_SETUP
#line 61 "imap_cern.l"
{
- BEGIN(INITIAL);
- cern_lval.id = g_strndup (cern_text, cern_leng);
- return COMMENT;
- }
- YY_BREAK
+ BEGIN(INITIAL);
+ cern_lval.id = g_strndup (cern_text, cern_leng);
+ return COMMENT;
+ }
+ YY_BREAK
case 5:
YY_RULE_SETUP
#line 67 "imap_cern.l"
return RECTANGLE;
- YY_BREAK
+ YY_BREAK
case 6:
YY_RULE_SETUP
#line 69 "imap_cern.l"
return CIRCLE;
- YY_BREAK
+ YY_BREAK
case 7:
YY_RULE_SETUP
#line 71 "imap_cern.l"
return POLYGON;
- YY_BREAK
+ YY_BREAK
case 8:
YY_RULE_SETUP
#line 73 "imap_cern.l"
return DEFAULT;
- YY_BREAK
+ YY_BREAK
case 9:
*yy_cp = (yy_hold_char); /* undo effects of setting up cern_text */
(yy_c_buf_p) = yy_cp -= 1;
@@ -960,399 +960,399 @@ YY_DO_BEFORE_ACTION; /* set up cern_text again */
YY_RULE_SETUP
#line 75 "imap_cern.l"
{
- cern_lval.id = g_strndup (cern_text, cern_leng);
- return LINK;
- }
- YY_BREAK
+ cern_lval.id = g_strndup (cern_text, cern_leng);
+ return LINK;
+ }
+ YY_BREAK
case 10:
YY_RULE_SETUP
#line 80 "imap_cern.l"
{
cern_lval.value = g_ascii_strtod (cern_text, NULL);
- return FLOAT;
- }
- YY_BREAK
+ return FLOAT;
+ }
+ YY_BREAK
case 11:
/* rule 11 can match eol */
YY_RULE_SETUP
#line 85 "imap_cern.l"
; /* Eat white space */
- YY_BREAK
+ YY_BREAK
case 12:
YY_RULE_SETUP
#line 87 "imap_cern.l"
return *cern_text;
- YY_BREAK
+ YY_BREAK
case 13:
YY_RULE_SETUP
#line 89 "imap_cern.l"
ECHO;
- YY_BREAK
+ YY_BREAK
#line 992 "<stdout>"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(comment):
- yyterminate();
-
- case YY_END_OF_BUFFER:
- {
- /* Amount of text matched not including the EOB char. */
- int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
-
- /* Undo the effects of YY_DO_BEFORE_ACTION. */
- *yy_cp = (yy_hold_char);
- YY_RESTORE_YY_MORE_OFFSET
-
- if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
- {
- /* We're scanning a new file or input source. It's
- * possible that this happened because the user
- * just pointed cern_in at a new source and called
- * cern_lex(). If so, then we have to assure
- * consistency between YY_CURRENT_BUFFER and our
- * globals. Here is the right place to do so, because
- * this is the first action (other than possibly a
- * back-up) that will match for the new input source.
- */
- (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
- YY_CURRENT_BUFFER_LVALUE->yy_input_file = cern_in;
- YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
- }
-
- /* Note that here we test for yy_c_buf_p "<=" to the position
- * of the first EOB in the buffer, since yy_c_buf_p will
- * already have been incremented past the NUL character
- * (since all states make transitions on EOB to the
- * end-of-buffer state). Contrast this with the test
- * in input().
- */
- if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
- { /* This was really a NUL. */
- yy_state_type yy_next_state;
-
- (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
-
- yy_current_state = yy_get_previous_state( );
-
- /* Okay, we're now positioned to make the NUL
- * transition. We couldn't have
- * yy_get_previous_state() go ahead and do it
- * for us because it doesn't know how to deal
- * with the possibility of jamming (and we don't
- * want to build jamming into it because then it
- * will run more slowly).
- */
-
- yy_next_state = yy_try_NUL_trans( yy_current_state );
-
- yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-
- if ( yy_next_state )
- {
- /* Consume the NUL. */
- yy_cp = ++(yy_c_buf_p);
- yy_current_state = yy_next_state;
- goto yy_match;
- }
-
- else
- {
- yy_cp = (yy_c_buf_p);
- goto yy_find_action;
- }
- }
-
- else switch ( yy_get_next_buffer( ) )
- {
- case EOB_ACT_END_OF_FILE:
- {
- (yy_did_buffer_switch_on_eof) = 0;
-
- if ( cern_wrap( ) )
- {
- /* Note: because we've taken care in
- * yy_get_next_buffer() to have set up
- * cern_text, we can now set up
- * yy_c_buf_p so that if some total
- * hoser (like flex itself) wants to
- * call the scanner after we return the
- * YY_NULL, it'll still work - another
- * YY_NULL will get returned.
- */
- (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
-
- yy_act = YY_STATE_EOF(YY_START);
- goto do_action;
- }
-
- else
- {
- if ( ! (yy_did_buffer_switch_on_eof) )
- YY_NEW_FILE;
- }
- break;
- }
-
- case EOB_ACT_CONTINUE_SCAN:
- (yy_c_buf_p) =
- (yytext_ptr) + yy_amount_of_matched_text;
-
- yy_current_state = yy_get_previous_state( );
-
- yy_cp = (yy_c_buf_p);
- yy_bp = (yytext_ptr) + YY_MORE_ADJ;
- goto yy_match;
-
- case EOB_ACT_LAST_MATCH:
- (yy_c_buf_p) =
- &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
-
- yy_current_state = yy_get_previous_state( );
-
- yy_cp = (yy_c_buf_p);
- yy_bp = (yytext_ptr) + YY_MORE_ADJ;
- goto yy_find_action;
- }
- break;
- }
-
- default:
- YY_FATAL_ERROR(
- "fatal flex scanner internal error--no action found" );
- } /* end of action switch */
- } /* end of scanning one token */
+ yyterminate();
+
+ case YY_END_OF_BUFFER:
+ {
+ /* Amount of text matched not including the EOB char. */
+ int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+ /* Undo the effects of YY_DO_BEFORE_ACTION. */
+ *yy_cp = (yy_hold_char);
+ YY_RESTORE_YY_MORE_OFFSET
+
+ if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+ {
+ /* We're scanning a new file or input source. It's
+ * possible that this happened because the user
+ * just pointed cern_in at a new source and called
+ * cern_lex(). If so, then we have to assure
+ * consistency between YY_CURRENT_BUFFER and our
+ * globals. Here is the right place to do so, because
+ * this is the first action (other than possibly a
+ * back-up) that will match for the new input source.
+ */
+ (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+ YY_CURRENT_BUFFER_LVALUE->yy_input_file = cern_in;
+ YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+ }
+
+ /* Note that here we test for yy_c_buf_p "<=" to the position
+ * of the first EOB in the buffer, since yy_c_buf_p will
+ * already have been incremented past the NUL character
+ * (since all states make transitions on EOB to the
+ * end-of-buffer state). Contrast this with the test
+ * in input().
+ */
+ if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+ { /* This was really a NUL. */
+ yy_state_type yy_next_state;
+
+ (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+ yy_current_state = yy_get_previous_state( );
+
+ /* Okay, we're now positioned to make the NUL
+ * transition. We couldn't have
+ * yy_get_previous_state() go ahead and do it
+ * for us because it doesn't know how to deal
+ * with the possibility of jamming (and we don't
+ * want to build jamming into it because then it
+ * will run more slowly).
+ */
+
+ yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+ yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+ if ( yy_next_state )
+ {
+ /* Consume the NUL. */
+ yy_cp = ++(yy_c_buf_p);
+ yy_current_state = yy_next_state;
+ goto yy_match;
+ }
+
+ else
+ {
+ yy_cp = (yy_c_buf_p);
+ goto yy_find_action;
+ }
+ }
+
+ else switch ( yy_get_next_buffer( ) )
+ {
+ case EOB_ACT_END_OF_FILE:
+ {
+ (yy_did_buffer_switch_on_eof) = 0;
+
+ if ( cern_wrap( ) )
+ {
+ /* Note: because we've taken care in
+ * yy_get_next_buffer() to have set up
+ * cern_text, we can now set up
+ * yy_c_buf_p so that if some total
+ * hoser (like flex itself) wants to
+ * call the scanner after we return the
+ * YY_NULL, it'll still work - another
+ * YY_NULL will get returned.
+ */
+ (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+ yy_act = YY_STATE_EOF(YY_START);
+ goto do_action;
+ }
+
+ else
+ {
+ if ( ! (yy_did_buffer_switch_on_eof) )
+ YY_NEW_FILE;
+ }
+ break;
+ }
+
+ case EOB_ACT_CONTINUE_SCAN:
+ (yy_c_buf_p) =
+ (yytext_ptr) + yy_amount_of_matched_text;
+
+ yy_current_state = yy_get_previous_state( );
+
+ yy_cp = (yy_c_buf_p);
+ yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+ goto yy_match;
+
+ case EOB_ACT_LAST_MATCH:
+ (yy_c_buf_p) =
+ &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+ yy_current_state = yy_get_previous_state( );
+
+ yy_cp = (yy_c_buf_p);
+ yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+ goto yy_find_action;
+ }
+ break;
+ }
+
+ default:
+ YY_FATAL_ERROR(
+ "fatal flex scanner internal error--no action found" );
+ } /* end of action switch */
+ } /* end of scanning one token */
} /* end of cern_lex */
/* yy_get_next_buffer - try to read in a new buffer
*
* Returns a code representing an action:
- * EOB_ACT_LAST_MATCH -
- * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- * EOB_ACT_END_OF_FILE - end of file
+ * EOB_ACT_LAST_MATCH -
+ * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ * EOB_ACT_END_OF_FILE - end of file
*/
static int yy_get_next_buffer (void)
{
- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
- register char *source = (yytext_ptr);
- register int number_to_move, i;
- int ret_val;
-
- if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
- YY_FATAL_ERROR(
- "fatal flex scanner internal error--end of buffer missed" );
-
- if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
- { /* Don't try to fill the buffer, so this is an EOF. */
- if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
- {
- /* We matched a single character, the EOB, so
- * treat this as a final EOF.
- */
- return EOB_ACT_END_OF_FILE;
- }
-
- else
- {
- /* We matched some text prior to the EOB, first
- * process it.
- */
- return EOB_ACT_LAST_MATCH;
- }
- }
-
- /* Try to read more data. */
-
- /* First move last chars to start of buffer. */
- number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
-
- for ( i = 0; i < number_to_move; ++i )
- *(dest++) = *(source++);
-
- if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
- /* don't do the read, it's not guaranteed to return an EOF,
- * just force an EOF
- */
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
-
- else
- {
- int num_to_read =
- YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-
- while ( num_to_read <= 0 )
- { /* Not enough room in the buffer - grow it. */
-
- /* just a shorter name for the current buffer */
- YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
-
- int yy_c_buf_p_offset =
- (int) ((yy_c_buf_p) - b->yy_ch_buf);
-
- if ( b->yy_is_our_buffer )
- {
- int new_size = b->yy_buf_size * 2;
-
- if ( new_size <= 0 )
- b->yy_buf_size += b->yy_buf_size / 8;
- else
- b->yy_buf_size *= 2;
-
- b->yy_ch_buf = (char *)
- /* Include room in for 2 EOB chars. */
- cern_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 );
- }
- else
- /* Can't grow it, we don't own it. */
- b->yy_ch_buf = 0;
-
- if ( ! b->yy_ch_buf )
- YY_FATAL_ERROR(
- "fatal error - scanner input buffer overflow" );
-
- (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
-
- num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
- number_to_move - 1;
-
- }
-
- if ( num_to_read > YY_READ_BUF_SIZE )
- num_to_read = YY_READ_BUF_SIZE;
-
- /* Read in more data. */
- YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- (yy_n_chars), (size_t) num_to_read );
-
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
- }
-
- if ( (yy_n_chars) == 0 )
- {
- if ( number_to_move == YY_MORE_ADJ )
- {
- ret_val = EOB_ACT_END_OF_FILE;
- cern_restart(cern_in );
- }
-
- else
- {
- ret_val = EOB_ACT_LAST_MATCH;
- YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
- YY_BUFFER_EOF_PENDING;
- }
- }
-
- else
- ret_val = EOB_ACT_CONTINUE_SCAN;
-
- if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
- /* Extend the array by 50%, plus the number we really need. */
- yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) cern_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size );
- if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
- YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
- }
-
- (yy_n_chars) += number_to_move;
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
-
- (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+ register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+ register char *source = (yytext_ptr);
+ register int number_to_move, i;
+ int ret_val;
+
+ if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+ YY_FATAL_ERROR(
+ "fatal flex scanner internal error--end of buffer missed" );
+
+ if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+ { /* Don't try to fill the buffer, so this is an EOF. */
+ if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+ {
+ /* We matched a single character, the EOB, so
+ * treat this as a final EOF.
+ */
+ return EOB_ACT_END_OF_FILE;
+ }
+
+ else
+ {
+ /* We matched some text prior to the EOB, first
+ * process it.
+ */
+ return EOB_ACT_LAST_MATCH;
+ }
+ }
+
+ /* Try to read more data. */
+
+ /* First move last chars to start of buffer. */
+ number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+ for ( i = 0; i < number_to_move; ++i )
+ *(dest++) = *(source++);
+
+ if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+ /* don't do the read, it's not guaranteed to return an EOF,
+ * just force an EOF
+ */
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+ else
+ {
+ int num_to_read =
+ YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+ while ( num_to_read <= 0 )
+ { /* Not enough room in the buffer - grow it. */
+
+ /* just a shorter name for the current buffer */
+ YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+ int yy_c_buf_p_offset =
+ (int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+ if ( b->yy_is_our_buffer )
+ {
+ int new_size = b->yy_buf_size * 2;
+
+ if ( new_size <= 0 )
+ b->yy_buf_size += b->yy_buf_size / 8;
+ else
+ b->yy_buf_size *= 2;
+
+ b->yy_ch_buf = (char *)
+ /* Include room in for 2 EOB chars. */
+ cern_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 );
+ }
+ else
+ /* Can't grow it, we don't own it. */
+ b->yy_ch_buf = 0;
+
+ if ( ! b->yy_ch_buf )
+ YY_FATAL_ERROR(
+ "fatal error - scanner input buffer overflow" );
+
+ (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+ num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+ number_to_move - 1;
+
+ }
+
+ if ( num_to_read > YY_READ_BUF_SIZE )
+ num_to_read = YY_READ_BUF_SIZE;
+
+ /* Read in more data. */
+ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+ (yy_n_chars), (size_t) num_to_read );
+
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+ }
+
+ if ( (yy_n_chars) == 0 )
+ {
+ if ( number_to_move == YY_MORE_ADJ )
+ {
+ ret_val = EOB_ACT_END_OF_FILE;
+ cern_restart(cern_in );
+ }
+
+ else
+ {
+ ret_val = EOB_ACT_LAST_MATCH;
+ YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+ YY_BUFFER_EOF_PENDING;
+ }
+ }
+
+ else
+ ret_val = EOB_ACT_CONTINUE_SCAN;
+
+ if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+ /* Extend the array by 50%, plus the number we really need. */
+ yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+ YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) cern_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size );
+ if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+ YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+ }
+
+ (yy_n_chars) += number_to_move;
+ YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+ YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+ (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
- return ret_val;
+ return ret_val;
}
/* yy_get_previous_state - get the state just before the EOB char was reached */
static yy_state_type yy_get_previous_state (void)
{
- register yy_state_type yy_current_state;
- register char *yy_cp;
+ register yy_state_type yy_current_state;
+ register char *yy_cp;
- yy_current_state = (yy_start);
-
- for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
- {
- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
- if ( yy_accept[yy_current_state] )
- {
- (yy_last_accepting_state) = yy_current_state;
- (yy_last_accepting_cpos) = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 94 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- }
-
- return yy_current_state;
+ yy_current_state = (yy_start);
+
+ for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+ {
+ register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ if ( yy_accept[yy_current_state] )
+ {
+ (yy_last_accepting_state) = yy_current_state;
+ (yy_last_accepting_cpos) = yy_cp;
+ }
+ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ {
+ yy_current_state = (int) yy_def[yy_current_state];
+ if ( yy_current_state >= 94 )
+ yy_c = yy_meta[(unsigned int) yy_c];
+ }
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ }
+
+ return yy_current_state;
}
/* yy_try_NUL_trans - try to make a transition on the NUL character
*
* synopsis
- * next_state = yy_try_NUL_trans( current_state );
+ * next_state = yy_try_NUL_trans( current_state );
*/
static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
{
- register int yy_is_jam;
- register char *yy_cp = (yy_c_buf_p);
-
- register YY_CHAR yy_c = 1;
- if ( yy_accept[yy_current_state] )
- {
- (yy_last_accepting_state) = yy_current_state;
- (yy_last_accepting_cpos) = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 94 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- yy_is_jam = (yy_current_state == 93);
-
- return yy_is_jam ? 0 : yy_current_state;
+ register int yy_is_jam;
+ register char *yy_cp = (yy_c_buf_p);
+
+ register YY_CHAR yy_c = 1;
+ if ( yy_accept[yy_current_state] )
+ {
+ (yy_last_accepting_state) = yy_current_state;
+ (yy_last_accepting_cpos) = yy_cp;
+ }
+ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ {
+ yy_current_state = (int) yy_def[yy_current_state];
+ if ( yy_current_state >= 94 )
+ yy_c = yy_meta[(unsigned int) yy_c];
+ }
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ yy_is_jam = (yy_current_state == 93);
+
+ return yy_is_jam ? 0 : yy_current_state;
}
static void yyunput (int c, register char * yy_bp )
{
- register char *yy_cp;
+ register char *yy_cp;
yy_cp = (yy_c_buf_p);
- /* undo effects of setting up cern_text */
- *yy_cp = (yy_hold_char);
+ /* undo effects of setting up cern_text */
+ *yy_cp = (yy_hold_char);
- if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
- { /* need to shift things up to make room */
- /* +2 for EOB chars. */
- register int number_to_move = (yy_n_chars) + 2;
- register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
- YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
- register char *source =
- &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+ if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+ { /* need to shift things up to make room */
+ /* +2 for EOB chars. */
+ register int number_to_move = (yy_n_chars) + 2;
+ register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+ register char *source =
+ &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
- while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
- *--dest = *--source;
+ while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+ *--dest = *--source;
- yy_cp += (int) (dest - source);
- yy_bp += (int) (dest - source);
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
- (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+ yy_cp += (int) (dest - source);
+ yy_bp += (int) (dest - source);
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+ (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
- if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
- YY_FATAL_ERROR( "flex scanner push-back overflow" );
- }
+ if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+ YY_FATAL_ERROR( "flex scanner push-back overflow" );
+ }
- *--yy_cp = (char) c;
+ *--yy_cp = (char) c;
- (yytext_ptr) = yy_bp;
- (yy_hold_char) = *yy_cp;
- (yy_c_buf_p) = yy_cp;
+ (yytext_ptr) = yy_bp;
+ (yy_hold_char) = *yy_cp;
+ (yy_c_buf_p) = yy_cp;
}
#ifndef YY_NO_INPUT
@@ -1363,71 +1363,71 @@ static int yy_get_next_buffer (void)
#endif
{
- int c;
+ int c;
- *(yy_c_buf_p) = (yy_hold_char);
-
- if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
- {
- /* yy_c_buf_p now points to the character we want to return.
- * If this occurs *before* the EOB characters, then it's a
- * valid NUL; if not, then we've hit the end of the buffer.
- */
- if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
- /* This was really a NUL. */
- *(yy_c_buf_p) = '\0';
-
- else
- { /* need more input */
- int offset = (yy_c_buf_p) - (yytext_ptr);
- ++(yy_c_buf_p);
-
- switch ( yy_get_next_buffer( ) )
- {
- case EOB_ACT_LAST_MATCH:
- /* This happens because yy_g_n_b()
- * sees that we've accumulated a
- * token and flags that we need to
- * try matching the token before
- * proceeding. But for input(),
- * there's no matching to consider.
- * So convert the EOB_ACT_LAST_MATCH
- * to EOB_ACT_END_OF_FILE.
- */
-
- /* Reset buffer status. */
- cern_restart(cern_in );
-
- /*FALLTHROUGH*/
-
- case EOB_ACT_END_OF_FILE:
- {
- if ( cern_wrap( ) )
- return EOF;
-
- if ( ! (yy_did_buffer_switch_on_eof) )
- YY_NEW_FILE;
+ *(yy_c_buf_p) = (yy_hold_char);
+
+ if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+ {
+ /* yy_c_buf_p now points to the character we want to return.
+ * If this occurs *before* the EOB characters, then it's a
+ * valid NUL; if not, then we've hit the end of the buffer.
+ */
+ if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+ /* This was really a NUL. */
+ *(yy_c_buf_p) = '\0';
+
+ else
+ { /* need more input */
+ int offset = (yy_c_buf_p) - (yytext_ptr);
+ ++(yy_c_buf_p);
+
+ switch ( yy_get_next_buffer( ) )
+ {
+ case EOB_ACT_LAST_MATCH:
+ /* This happens because yy_g_n_b()
+ * sees that we've accumulated a
+ * token and flags that we need to
+ * try matching the token before
+ * proceeding. But for input(),
+ * there's no matching to consider.
+ * So convert the EOB_ACT_LAST_MATCH
+ * to EOB_ACT_END_OF_FILE.
+ */
+
+ /* Reset buffer status. */
+ cern_restart(cern_in );
+
+ /*FALLTHROUGH*/
+
+ case EOB_ACT_END_OF_FILE:
+ {
+ if ( cern_wrap( ) )
+ return EOF;
+
+ if ( ! (yy_did_buffer_switch_on_eof) )
+ YY_NEW_FILE;
#ifdef __cplusplus
- return yyinput();
+ return yyinput();
#else
- return input();
+ return input();
#endif
- }
+ }
- case EOB_ACT_CONTINUE_SCAN:
- (yy_c_buf_p) = (yytext_ptr) + offset;
- break;
- }
- }
- }
+ case EOB_ACT_CONTINUE_SCAN:
+ (yy_c_buf_p) = (yytext_ptr) + offset;
+ break;
+ }
+ }
+ }
- c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */
- *(yy_c_buf_p) = '\0'; /* preserve cern_text */
- (yy_hold_char) = *++(yy_c_buf_p);
+ c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */
+ *(yy_c_buf_p) = '\0'; /* preserve cern_text */
+ (yy_hold_char) = *++(yy_c_buf_p);
- return c;
+ return c;
}
-#endif /* ifndef YY_NO_INPUT */
+#endif /* ifndef YY_NO_INPUT */
/** Immediately switch to a different input stream.
* @param input_file A readable stream.
@@ -1437,14 +1437,14 @@ static int yy_get_next_buffer (void)
void cern_restart (FILE * input_file )
{
- if ( ! YY_CURRENT_BUFFER ){
+ if ( ! YY_CURRENT_BUFFER ){
cern_ensure_buffer_stack ();
- YY_CURRENT_BUFFER_LVALUE =
+ YY_CURRENT_BUFFER_LVALUE =
cern__create_buffer(cern_in,YY_BUF_SIZE );
- }
+ }
- cern__init_buffer(YY_CURRENT_BUFFER,input_file );
- cern__load_buffer_state( );
+ cern__init_buffer(YY_CURRENT_BUFFER,input_file );
+ cern__load_buffer_state( );
}
/** Switch to a different input buffer.
@@ -1454,40 +1454,40 @@ static int yy_get_next_buffer (void)
void cern__switch_to_buffer (YY_BUFFER_STATE new_buffer )
{
- /* TODO. We should be able to replace this entire function body
- * with
- * cern_pop_buffer_state();
- * cern_push_buffer_state(new_buffer);
+ /* TODO. We should be able to replace this entire function body
+ * with
+ * cern_pop_buffer_state();
+ * cern_push_buffer_state(new_buffer);
*/
- cern_ensure_buffer_stack ();
- if ( YY_CURRENT_BUFFER == new_buffer )
- return;
-
- if ( YY_CURRENT_BUFFER )
- {
- /* Flush out information for old buffer. */
- *(yy_c_buf_p) = (yy_hold_char);
- YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
- }
-
- YY_CURRENT_BUFFER_LVALUE = new_buffer;
- cern__load_buffer_state( );
-
- /* We don't actually know whether we did this switch during
- * EOF (cern_wrap()) processing, but the only time this flag
- * is looked at is after cern_wrap() is called, so it's safe
- * to go ahead and always set it.
- */
- (yy_did_buffer_switch_on_eof) = 1;
+ cern_ensure_buffer_stack ();
+ if ( YY_CURRENT_BUFFER == new_buffer )
+ return;
+
+ if ( YY_CURRENT_BUFFER )
+ {
+ /* Flush out information for old buffer. */
+ *(yy_c_buf_p) = (yy_hold_char);
+ YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+ }
+
+ YY_CURRENT_BUFFER_LVALUE = new_buffer;
+ cern__load_buffer_state( );
+
+ /* We don't actually know whether we did this switch during
+ * EOF (cern_wrap()) processing, but the only time this flag
+ * is looked at is after cern_wrap() is called, so it's safe
+ * to go ahead and always set it.
+ */
+ (yy_did_buffer_switch_on_eof) = 1;
}
static void cern__load_buffer_state (void)
{
- (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
- (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
- cern_in = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
- (yy_hold_char) = *(yy_c_buf_p);
+ (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+ (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+ cern_in = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+ (yy_hold_char) = *(yy_c_buf_p);
}
/** Allocate and initialize an input buffer state.
@@ -1498,26 +1498,26 @@ static void cern__load_buffer_state (void)
*/
YY_BUFFER_STATE cern__create_buffer (FILE * file, int size )
{
- YY_BUFFER_STATE b;
+ YY_BUFFER_STATE b;
- b = (YY_BUFFER_STATE) cern_alloc(sizeof( struct yy_buffer_state ) );
- if ( ! b )
- YY_FATAL_ERROR( "out of dynamic memory in cern__create_buffer()" );
+ b = (YY_BUFFER_STATE) cern_alloc(sizeof( struct yy_buffer_state ) );
+ if ( ! b )
+ YY_FATAL_ERROR( "out of dynamic memory in cern__create_buffer()" );
- b->yy_buf_size = size;
+ b->yy_buf_size = size;
- /* yy_ch_buf has to be 2 characters longer than the size given because
- * we need to put in 2 end-of-buffer characters.
- */
- b->yy_ch_buf = (char *) cern_alloc(b->yy_buf_size + 2 );
- if ( ! b->yy_ch_buf )
- YY_FATAL_ERROR( "out of dynamic memory in cern__create_buffer()" );
+ /* yy_ch_buf has to be 2 characters longer than the size given because
+ * we need to put in 2 end-of-buffer characters.
+ */
+ b->yy_ch_buf = (char *) cern_alloc(b->yy_buf_size + 2 );
+ if ( ! b->yy_ch_buf )
+ YY_FATAL_ERROR( "out of dynamic memory in cern__create_buffer()" );
- b->yy_is_our_buffer = 1;
+ b->yy_is_our_buffer = 1;
- cern__init_buffer(b,file );
+ cern__init_buffer(b,file );
- return b;
+ return b;
}
/** Destroy the buffer.
@@ -1527,16 +1527,16 @@ static void cern__load_buffer_state (void)
void cern__delete_buffer (YY_BUFFER_STATE b )
{
- if ( ! b )
- return;
+ if ( ! b )
+ return;
- if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
- YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+ if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+ YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
- if ( b->yy_is_our_buffer )
- cern_free((void *) b->yy_ch_buf );
+ if ( b->yy_is_our_buffer )
+ cern_free((void *) b->yy_ch_buf );
- cern_free((void *) b );
+ cern_free((void *) b );
}
#ifndef __cplusplus
@@ -1550,12 +1550,12 @@ extern int isatty (int );
static void cern__init_buffer (YY_BUFFER_STATE b, FILE * file )
{
- int oerrno = errno;
+ int oerrno = errno;
- cern__flush_buffer(b );
+ cern__flush_buffer(b );
- b->yy_input_file = file;
- b->yy_fill_buffer = 1;
+ b->yy_input_file = file;
+ b->yy_fill_buffer = 1;
/* If b is the current buffer, then cern__init_buffer was _probably_
* called from cern_restart() or through yy_get_next_buffer.
@@ -1568,7 +1568,7 @@ extern int isatty (int );
b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
- errno = oerrno;
+ errno = oerrno;
}
/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
@@ -1577,25 +1577,25 @@ extern int isatty (int );
*/
void cern__flush_buffer (YY_BUFFER_STATE b )
{
- if ( ! b )
- return;
+ if ( ! b )
+ return;
- b->yy_n_chars = 0;
+ b->yy_n_chars = 0;
- /* We always need two end-of-buffer characters. The first causes
- * a transition to the end-of-buffer state. The second causes
- * a jam in that state.
- */
- b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
- b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+ /* We always need two end-of-buffer characters. The first causes
+ * a transition to the end-of-buffer state. The second causes
+ * a jam in that state.
+ */
+ b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+ b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
- b->yy_buf_pos = &b->yy_ch_buf[0];
+ b->yy_buf_pos = &b->yy_ch_buf[0];
- b->yy_at_bol = 1;
- b->yy_buffer_status = YY_BUFFER_NEW;
+ b->yy_at_bol = 1;
+ b->yy_buffer_status = YY_BUFFER_NEW;
- if ( b == YY_CURRENT_BUFFER )
- cern__load_buffer_state( );
+ if ( b == YY_CURRENT_BUFFER )
+ cern__load_buffer_state( );
}
/** Pushes the new state onto the stack. The new state becomes
@@ -1606,28 +1606,28 @@ extern int isatty (int );
*/
void cern_push_buffer_state (YY_BUFFER_STATE new_buffer )
{
- if (new_buffer == NULL)
- return;
-
- cern_ensure_buffer_stack();
-
- /* This block is copied from cern__switch_to_buffer. */
- if ( YY_CURRENT_BUFFER )
- {
- /* Flush out information for old buffer. */
- *(yy_c_buf_p) = (yy_hold_char);
- YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
- }
-
- /* Only push if top exists. Otherwise, replace top. */
- if (YY_CURRENT_BUFFER)
- (yy_buffer_stack_top)++;
- YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
- /* copied from cern__switch_to_buffer. */
- cern__load_buffer_state( );
- (yy_did_buffer_switch_on_eof) = 1;
+ if (new_buffer == NULL)
+ return;
+
+ cern_ensure_buffer_stack();
+
+ /* This block is copied from cern__switch_to_buffer. */
+ if ( YY_CURRENT_BUFFER )
+ {
+ /* Flush out information for old buffer. */
+ *(yy_c_buf_p) = (yy_hold_char);
+ YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+ }
+
+ /* Only push if top exists. Otherwise, replace top. */
+ if (YY_CURRENT_BUFFER)
+ (yy_buffer_stack_top)++;
+ YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+ /* copied from cern__switch_to_buffer. */
+ cern__load_buffer_state( );
+ (yy_did_buffer_switch_on_eof) = 1;
}
/** Removes and deletes the top of the stack, if present.
@@ -1636,18 +1636,18 @@ void cern_push_buffer_state (YY_BUFFER_STATE new_buffer )
*/
void cern_pop_buffer_state (void)
{
- if (!YY_CURRENT_BUFFER)
- return;
-
- cern__delete_buffer(YY_CURRENT_BUFFER );
- YY_CURRENT_BUFFER_LVALUE = NULL;
- if ((yy_buffer_stack_top) > 0)
- --(yy_buffer_stack_top);
-
- if (YY_CURRENT_BUFFER) {
- cern__load_buffer_state( );
- (yy_did_buffer_switch_on_eof) = 1;
- }
+ if (!YY_CURRENT_BUFFER)
+ return;
+
+ cern__delete_buffer(YY_CURRENT_BUFFER );
+ YY_CURRENT_BUFFER_LVALUE = NULL;
+ if ((yy_buffer_stack_top) > 0)
+ --(yy_buffer_stack_top);
+
+ if (YY_CURRENT_BUFFER) {
+ cern__load_buffer_state( );
+ (yy_did_buffer_switch_on_eof) = 1;
+ }
}
/* Allocates the stack if it does not exist.
@@ -1655,45 +1655,45 @@ void cern_pop_buffer_state (void)
*/
static void cern_ensure_buffer_stack (void)
{
- int num_to_alloc;
+ int num_to_alloc;
- if (!(yy_buffer_stack)) {
+ if (!(yy_buffer_stack)) {
- /* First allocation is just for 2 elements, since we don't know if this
- * scanner will even need a stack. We use 2 instead of 1 to avoid an
- * immediate realloc on the next call.
+ /* First allocation is just for 2 elements, since we don't know if this
+ * scanner will even need a stack. We use 2 instead of 1 to avoid an
+ * immediate realloc on the next call.
*/
- num_to_alloc = 1;
- (yy_buffer_stack) = (struct yy_buffer_state**)cern_alloc
- (num_to_alloc * sizeof(struct yy_buffer_state*)
- );
- if ( ! (yy_buffer_stack) )
- YY_FATAL_ERROR( "out of dynamic memory in cern_ensure_buffer_stack()" );
-
- memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-
- (yy_buffer_stack_max) = num_to_alloc;
- (yy_buffer_stack_top) = 0;
- return;
- }
-
- if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
- /* Increase the buffer to prepare for a possible push. */
- int grow_size = 8 /* arbitrary grow size */;
-
- num_to_alloc = (yy_buffer_stack_max) + grow_size;
- (yy_buffer_stack) = (struct yy_buffer_state**)cern_realloc
- ((yy_buffer_stack),
- num_to_alloc * sizeof(struct yy_buffer_state*)
- );
- if ( ! (yy_buffer_stack) )
- YY_FATAL_ERROR( "out of dynamic memory in cern_ensure_buffer_stack()" );
-
- /* zero only the new slots.*/
- memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
- (yy_buffer_stack_max) = num_to_alloc;
- }
+ num_to_alloc = 1;
+ (yy_buffer_stack) = (struct yy_buffer_state**)cern_alloc
+ (num_to_alloc * sizeof(struct yy_buffer_state*)
+ );
+ if ( ! (yy_buffer_stack) )
+ YY_FATAL_ERROR( "out of dynamic memory in cern_ensure_buffer_stack()" );
+
+ memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+
+ (yy_buffer_stack_max) = num_to_alloc;
+ (yy_buffer_stack_top) = 0;
+ return;
+ }
+
+ if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+ /* Increase the buffer to prepare for a possible push. */
+ int grow_size = 8 /* arbitrary grow size */;
+
+ num_to_alloc = (yy_buffer_stack_max) + grow_size;
+ (yy_buffer_stack) = (struct yy_buffer_state**)cern_realloc
+ ((yy_buffer_stack),
+ num_to_alloc * sizeof(struct yy_buffer_state*)
+ );
+ if ( ! (yy_buffer_stack) )
+ YY_FATAL_ERROR( "out of dynamic memory in cern_ensure_buffer_stack()" );
+
+ /* zero only the new slots.*/
+ memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+ (yy_buffer_stack_max) = num_to_alloc;
+ }
}
/** Setup the input buffer state to scan directly from a user-specified character buffer.
@@ -1704,31 +1704,31 @@ static void cern_ensure_buffer_stack (void)
*/
YY_BUFFER_STATE cern__scan_buffer (char * base, yy_size_t size )
{
- YY_BUFFER_STATE b;
+ YY_BUFFER_STATE b;
- if ( size < 2 ||
- base[size-2] != YY_END_OF_BUFFER_CHAR ||
- base[size-1] != YY_END_OF_BUFFER_CHAR )
- /* They forgot to leave room for the EOB's. */
- return 0;
-
- b = (YY_BUFFER_STATE) cern_alloc(sizeof( struct yy_buffer_state ) );
- if ( ! b )
- YY_FATAL_ERROR( "out of dynamic memory in cern__scan_buffer()" );
-
- b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
- b->yy_buf_pos = b->yy_ch_buf = base;
- b->yy_is_our_buffer = 0;
- b->yy_input_file = 0;
- b->yy_n_chars = b->yy_buf_size;
- b->yy_is_interactive = 0;
- b->yy_at_bol = 1;
- b->yy_fill_buffer = 0;
- b->yy_buffer_status = YY_BUFFER_NEW;
-
- cern__switch_to_buffer(b );
-
- return b;
+ if ( size < 2 ||
+ base[size-2] != YY_END_OF_BUFFER_CHAR ||
+ base[size-1] != YY_END_OF_BUFFER_CHAR )
+ /* They forgot to leave room for the EOB's. */
+ return 0;
+
+ b = (YY_BUFFER_STATE) cern_alloc(sizeof( struct yy_buffer_state ) );
+ if ( ! b )
+ YY_FATAL_ERROR( "out of dynamic memory in cern__scan_buffer()" );
+
+ b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
+ b->yy_buf_pos = b->yy_ch_buf = base;
+ b->yy_is_our_buffer = 0;
+ b->yy_input_file = 0;
+ b->yy_n_chars = b->yy_buf_size;
+ b->yy_is_interactive = 0;
+ b->yy_at_bol = 1;
+ b->yy_fill_buffer = 0;
+ b->yy_buffer_status = YY_BUFFER_NEW;
+
+ cern__switch_to_buffer(b );
+
+ return b;
}
/** Setup the input buffer state to scan a string. The next call to cern_lex() will
@@ -1742,7 +1742,7 @@ YY_BUFFER_STATE cern__scan_buffer (char * base, yy_size_t size )
YY_BUFFER_STATE cern__scan_string (yyconst char * yystr )
{
- return cern__scan_bytes(yystr,strlen(yystr) );
+ return cern__scan_bytes(yystr,strlen(yystr) );
}
/** Setup the input buffer state to scan the given bytes. The next call to cern_lex() will
@@ -1754,32 +1754,32 @@ YY_BUFFER_STATE cern__scan_string (yyconst char * yystr )
*/
YY_BUFFER_STATE cern__scan_bytes (yyconst char * yybytes, int _yybytes_len )
{
- YY_BUFFER_STATE b;
- char *buf;
- yy_size_t n;
- int i;
+ YY_BUFFER_STATE b;
+ char *buf;
+ yy_size_t n;
+ int i;
- /* Get memory for full buffer, including space for trailing EOB's. */
- n = _yybytes_len + 2;
- buf = (char *) cern_alloc(n );
- if ( ! buf )
- YY_FATAL_ERROR( "out of dynamic memory in cern__scan_bytes()" );
+ /* Get memory for full buffer, including space for trailing EOB's. */
+ n = _yybytes_len + 2;
+ buf = (char *) cern_alloc(n );
+ if ( ! buf )
+ YY_FATAL_ERROR( "out of dynamic memory in cern__scan_bytes()" );
- for ( i = 0; i < _yybytes_len; ++i )
- buf[i] = yybytes[i];
+ for ( i = 0; i < _yybytes_len; ++i )
+ buf[i] = yybytes[i];
- buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+ buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
- b = cern__scan_buffer(buf,n );
- if ( ! b )
- YY_FATAL_ERROR( "bad buffer in cern__scan_bytes()" );
+ b = cern__scan_buffer(buf,n );
+ if ( ! b )
+ YY_FATAL_ERROR( "bad buffer in cern__scan_bytes()" );
- /* It's okay to grow etc. this buffer, and we should throw it
- * away when we're done.
- */
- b->yy_is_our_buffer = 1;
+ /* It's okay to grow etc. this buffer, and we should throw it
+ * away when we're done.
+ */
+ b->yy_is_our_buffer = 1;
- return b;
+ return b;
}
#ifndef YY_EXIT_FAILURE
@@ -1788,26 +1788,26 @@ YY_BUFFER_STATE cern__scan_bytes (yyconst char * yybytes, int _yybytes_len )
static void yy_fatal_error (yyconst char* msg )
{
- (void) fprintf( stderr, "%s\n", msg );
- exit( YY_EXIT_FAILURE );
+ (void) fprintf( stderr, "%s\n", msg );
+ exit( YY_EXIT_FAILURE );
}
/* Redefine yyless() so it works in section 3 code. */
#undef yyless
#define yyless(n) \
- do \
- { \
- /* Undo effects of setting up cern_text. */ \
+ do \
+ { \
+ /* Undo effects of setting up cern_text. */ \
int yyless_macro_arg = (n); \
YY_LESS_LINENO(yyless_macro_arg);\
- cern_text[cern_leng] = (yy_hold_char); \
- (yy_c_buf_p) = cern_text + yyless_macro_arg; \
- (yy_hold_char) = *(yy_c_buf_p); \
- *(yy_c_buf_p) = '\0'; \
- cern_leng = yyless_macro_arg; \
- } \
- while ( 0 )
+ cern_text[cern_leng] = (yy_hold_char); \
+ (yy_c_buf_p) = cern_text + yyless_macro_arg; \
+ (yy_hold_char) = *(yy_c_buf_p); \
+ *(yy_c_buf_p) = '\0'; \
+ cern_leng = yyless_macro_arg; \
+ } \
+ while ( 0 )
/* Accessor methods (get/set functions) to struct members. */
@@ -1922,15 +1922,15 @@ int cern_lex_destroy (void)
{
/* Pop the buffer stack, destroying each element. */
- while(YY_CURRENT_BUFFER){
- cern__delete_buffer(YY_CURRENT_BUFFER );
- YY_CURRENT_BUFFER_LVALUE = NULL;
- cern_pop_buffer_state();
- }
+ while(YY_CURRENT_BUFFER){
+ cern__delete_buffer(YY_CURRENT_BUFFER );
+ YY_CURRENT_BUFFER_LVALUE = NULL;
+ cern_pop_buffer_state();
+ }
- /* Destroy the stack itself. */
- cern_free((yy_buffer_stack) );
- (yy_buffer_stack) = NULL;
+ /* Destroy the stack itself. */
+ cern_free((yy_buffer_stack) );
+ (yy_buffer_stack) = NULL;
/* Reset the globals. This is important in a non-reentrant scanner so the next time
* cern_lex() is called, initialization will occur. */
@@ -1946,43 +1946,43 @@ int cern_lex_destroy (void)
#ifndef yytext_ptr
static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
{
- register int i;
- for ( i = 0; i < n; ++i )
- s1[i] = s2[i];
+ register int i;
+ for ( i = 0; i < n; ++i )
+ s1[i] = s2[i];
}
#endif
#ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * s )
{
- register int n;
- for ( n = 0; s[n]; ++n )
- ;
+ register int n;
+ for ( n = 0; s[n]; ++n )
+ ;
- return n;
+ return n;
}
#endif
void *cern_alloc (yy_size_t size )
{
- return (void *) malloc( size );
+ return (void *) malloc( size );
}
void *cern_realloc (void * ptr, yy_size_t size )
{
- /* The cast to (char *) in the following accommodates both
- * implementations that use char* generic pointers, and those
- * that use void* generic pointers. It works with the latter
- * because both ANSI C and C++ allow castless assignment from
- * any pointer type to void*, and deal with argument conversions
- * as though doing an assignment.
- */
- return (void *) realloc( (char *) ptr, size );
+ /* The cast to (char *) in the following accommodates both
+ * implementations that use char* generic pointers, and those
+ * that use void* generic pointers. It works with the latter
+ * because both ANSI C and C++ allow castless assignment from
+ * any pointer type to void*, and deal with argument conversions
+ * as though doing an assignment.
+ */
+ return (void *) realloc( (char *) ptr, size );
}
void cern_free (void * ptr )
{
- free( (char *) ptr ); /* see cern_realloc() for (char *) cast */
+ free( (char *) ptr ); /* see cern_realloc() for (char *) cast */
}
#define YYTABLES_NAME "yytables"
diff --git a/plug-ins/imagemap/imap_cern_parse.c b/plug-ins/imagemap/imap_cern_parse.c
index 655e0a7..80ad62c 100644
--- a/plug-ins/imagemap/imap_cern_parse.c
+++ b/plug-ins/imagemap/imap_cern_parse.c
@@ -176,7 +176,7 @@ typedef union YYSTYPE
}
/* Line 187 of yacc.c. */
#line 179 "y.tab.c"
- YYSTYPE;
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
@@ -320,7 +320,7 @@ YYID (i)
# endif
# if (defined __cplusplus && ! defined _STDLIB_H \
&& ! ((defined YYMALLOC || defined malloc) \
- && (defined YYFREE || defined free)))
+ && (defined YYFREE || defined free)))
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
# ifndef _STDLIB_H
# define _STDLIB_H 1
@@ -346,7 +346,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
#if (! defined yyoverflow \
&& (! defined __cplusplus \
- || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+ || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
/* A type that is properly aligned for any stack member. */
union yyalloc
@@ -371,13 +371,13 @@ union yyalloc
# define YYCOPY(To, From, Count) \
__builtin_memcpy (To, From, (Count) * sizeof (*(From)))
# else
-# define YYCOPY(To, From, Count) \
- do \
- { \
- YYSIZE_T yyi; \
- for (yyi = 0; yyi < (Count); yyi++) \
- (To)[yyi] = (From)[yyi]; \
- } \
+# define YYCOPY(To, From, Count) \
+ do \
+ { \
+ YYSIZE_T yyi; \
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (To)[yyi] = (From)[yyi]; \
+ } \
while (YYID (0))
# endif
# endif
@@ -387,15 +387,15 @@ union yyalloc
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack) \
- do \
- { \
- YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack, Stack, yysize); \
- Stack = &yyptr->Stack; \
- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
- yyptr += yynewbytes / sizeof (*yyptr); \
- } \
+# define YYSTACK_RELOCATE(Stack) \
+ do \
+ { \
+ YYSIZE_T yynewbytes; \
+ YYCOPY (&yyptr->Stack, Stack, yysize); \
+ Stack = &yyptr->Stack; \
+ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+ yyptr += yynewbytes / sizeof (*yyptr); \
+ } \
while (YYID (0))
#endif
@@ -418,7 +418,7 @@ union yyalloc
#define YYUNDEFTOK 2
#define YYMAXUTOK 267
-#define YYTRANSLATE(YYX) \
+#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
@@ -597,44 +597,44 @@ static const yytype_uint8 yystos[] =
12
};
-#define yyerrok (yyerrstatus = 0)
-#define yyclearin (yychar = YYEMPTY)
-#define YYEMPTY (-2)
-#define YYEOF 0
+#define yyerrok (yyerrstatus = 0)
+#define yyclearin (yychar = YYEMPTY)
+#define YYEMPTY (-2)
+#define YYEOF 0
-#define YYACCEPT goto yyacceptlab
-#define YYABORT goto yyabortlab
-#define YYERROR goto yyerrorlab
+#define YYACCEPT goto yyacceptlab
+#define YYABORT goto yyabortlab
+#define YYERROR goto yyerrorlab
/* Like YYERROR except do call yyerror. This remains here temporarily
to ease the transition to the new meaning of YYERROR, for GCC.
Once GCC version 2 has supplanted version 1, this can go. */
-#define YYFAIL goto yyerrlab
+#define YYFAIL goto yyerrlab
#define YYRECOVERING() (!!yyerrstatus)
-#define YYBACKUP(Token, Value) \
-do \
- if (yychar == YYEMPTY && yylen == 1) \
- { \
- yychar = (Token); \
- yylval = (Value); \
- yytoken = YYTRANSLATE (yychar); \
- YYPOPSTACK (1); \
- goto yybackup; \
- } \
- else \
- { \
+#define YYBACKUP(Token, Value) \
+do \
+ if (yychar == YYEMPTY && yylen == 1) \
+ { \
+ yychar = (Token); \
+ yylval = (Value); \
+ yytoken = YYTRANSLATE (yychar); \
+ YYPOPSTACK (1); \
+ goto yybackup; \
+ } \
+ else \
+ { \
yyerror (YY_("syntax error: cannot back up")); \
- YYERROR; \
- } \
+ YYERROR; \
+ } \
while (YYID (0))
-#define YYTERROR 1
-#define YYERRCODE 256
+#define YYTERROR 1
+#define YYERRCODE 256
/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
@@ -643,22 +643,22 @@ while (YYID (0))
#define YYRHSLOC(Rhs, K) ((Rhs)[K])
#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
- do \
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ do \
if (YYID (N)) \
- { \
- (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
- (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
- (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
- (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
- } \
- else \
- { \
- (Current).first_line = (Current).last_line = \
- YYRHSLOC (Rhs, 0).last_line; \
- (Current).first_column = (Current).last_column = \
- YYRHSLOC (Rhs, 0).last_column; \
- } \
+ { \
+ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
+ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
+ (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
+ (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
+ } \
+ else \
+ { \
+ (Current).first_line = (Current).last_line = \
+ YYRHSLOC (Rhs, 0).last_line; \
+ (Current).first_column = (Current).last_column = \
+ YYRHSLOC (Rhs, 0).last_column; \
+ } \
while (YYID (0))
#endif
@@ -669,10 +669,10 @@ while (YYID (0))
#ifndef YY_LOCATION_PRINT
# if YYLTYPE_IS_TRIVIAL
-# define YY_LOCATION_PRINT(File, Loc) \
- fprintf (File, "%d.%d-%d.%d", \
- (Loc).first_line, (Loc).first_column, \
- (Loc).last_line, (Loc).last_column)
+# define YY_LOCATION_PRINT(File, Loc) \
+ fprintf (File, "%d.%d-%d.%d", \
+ (Loc).first_line, (Loc).first_column, \
+ (Loc).last_line, (Loc).last_column)
# else
# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
# endif
@@ -695,21 +695,21 @@ while (YYID (0))
# define YYFPRINTF fprintf
# endif
-# define YYDPRINTF(Args) \
-do { \
- if (yydebug) \
- YYFPRINTF Args; \
+# define YYDPRINTF(Args) \
+do { \
+ if (yydebug) \
+ YYFPRINTF Args; \
} while (YYID (0))
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
-do { \
- if (yydebug) \
- { \
- YYFPRINTF (stderr, "%s ", Title); \
- yy_symbol_print (stderr, \
- Type, Value); \
- YYFPRINTF (stderr, "\n"); \
- } \
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+do { \
+ if (yydebug) \
+ { \
+ YYFPRINTF (stderr, "%s ", Title); \
+ yy_symbol_print (stderr, \
+ Type, Value); \
+ YYFPRINTF (stderr, "\n"); \
+ } \
} while (YYID (0))
@@ -741,7 +741,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
switch (yytype)
{
default:
- break;
+ break;
}
}
@@ -793,10 +793,10 @@ yy_stack_print (bottom, top)
YYFPRINTF (stderr, "\n");
}
-# define YY_STACK_PRINT(Bottom, Top) \
-do { \
- if (yydebug) \
- yy_stack_print ((Bottom), (Top)); \
+# define YY_STACK_PRINT(Bottom, Top) \
+do { \
+ if (yydebug) \
+ yy_stack_print ((Bottom), (Top)); \
} while (YYID (0))
@@ -819,21 +819,21 @@ yy_reduce_print (yyvsp, yyrule)
int yyi;
unsigned long int yylno = yyrline[yyrule];
YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
- yyrule - 1, yylno);
+ yyrule - 1, yylno);
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
fprintf (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
- &(yyvsp[(yyi + 1) - (yynrhs)])
- );
+ &(yyvsp[(yyi + 1) - (yynrhs)])
+ );
fprintf (stderr, "\n");
}
}
-# define YY_REDUCE_PRINT(Rule) \
-do { \
- if (yydebug) \
+# define YY_REDUCE_PRINT(Rule) \
+do { \
+ if (yydebug) \
yy_reduce_print (yyvsp, Rule); \
} while (YYID (0))
@@ -849,7 +849,7 @@ int yydebug;
/* YYINITDEPTH -- initial size of the parser's stacks. */
-#ifndef YYINITDEPTH
+#ifndef YYINITDEPTH
# define YYINITDEPTH 200
#endif
@@ -936,27 +936,27 @@ yytnamerr (char *yyres, const char *yystr)
char const *yyp = yystr;
for (;;)
- switch (*++yyp)
- {
- case '\'':
- case ',':
- goto do_not_strip_quotes;
-
- case '\\':
- if (*++yyp != '\\')
- goto do_not_strip_quotes;
- /* Fall through. */
- default:
- if (yyres)
- yyres[yyn] = *yyp;
- yyn++;
- break;
-
- case '"':
- if (yyres)
- yyres[yyn] = '\0';
- return yyn;
- }
+ switch (*++yyp)
+ {
+ case '\'':
+ case ',':
+ goto do_not_strip_quotes;
+
+ case '\\':
+ if (*++yyp != '\\')
+ goto do_not_strip_quotes;
+ /* Fall through. */
+ default:
+ if (yyres)
+ yyres[yyn] = *yyp;
+ yyn++;
+ break;
+
+ case '"':
+ if (yyres)
+ yyres[yyn] = '\0';
+ return yyn;
+ }
do_not_strip_quotes: ;
}
@@ -994,7 +994,7 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
# if 0
/* This is so xgettext sees the translatable formats that are
- constructed on the fly. */
+ constructed on the fly. */
YY_("syntax error, unexpected %s");
YY_("syntax error, unexpected %s, expecting %s");
YY_("syntax error, unexpected %s, expecting %s or %s");
@@ -1007,13 +1007,13 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
static char const yyexpecting[] = ", expecting %s";
static char const yyor[] = " or %s";
char yyformat[sizeof yyunexpected
- + sizeof yyexpecting - 1
- + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
- * (sizeof yyor - 1))];
+ + sizeof yyexpecting - 1
+ + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+ * (sizeof yyor - 1))];
char const *yyprefix = yyexpecting;
/* Start YYX at -YYN if negative to avoid negative indexes in
- YYCHECK. */
+ YYCHECK. */
int yyxbegin = yyn < 0 ? -yyn : 0;
/* Stay within bounds of both yycheck and yytname. */
@@ -1025,22 +1025,22 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
yyfmt = yystpcpy (yyformat, yyunexpected);
for (yyx = yyxbegin; yyx < yyxend; ++yyx)
- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
- {
- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
- {
- yycount = 1;
- yysize = yysize0;
- yyformat[sizeof yyunexpected - 1] = '\0';
- break;
- }
- yyarg[yycount++] = yytname[yyx];
- yysize1 = yysize + yytnamerr (0, yytname[yyx]);
- yysize_overflow |= (yysize1 < yysize);
- yysize = yysize1;
- yyfmt = yystpcpy (yyfmt, yyprefix);
- yyprefix = yyor;
- }
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+ {
+ if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+ {
+ yycount = 1;
+ yysize = yysize0;
+ yyformat[sizeof yyunexpected - 1] = '\0';
+ break;
+ }
+ yyarg[yycount++] = yytname[yyx];
+ yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+ yysize_overflow |= (yysize1 < yysize);
+ yysize = yysize1;
+ yyfmt = yystpcpy (yyfmt, yyprefix);
+ yyprefix = yyor;
+ }
yyf = YY_(yyformat);
yysize1 = yysize + yystrlen (yyf);
@@ -1048,29 +1048,29 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
yysize = yysize1;
if (yysize_overflow)
- return YYSIZE_MAXIMUM;
+ return YYSIZE_MAXIMUM;
if (yyresult)
- {
- /* Avoid sprintf, as that infringes on the user's name space.
- Don't have undefined behavior even if the translation
- produced a string with the wrong number of "%s"s. */
- char *yyp = yyresult;
- int yyi = 0;
- while ((*yyp = *yyf) != '\0')
- {
- if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
- {
- yyp += yytnamerr (yyp, yyarg[yyi++]);
- yyf += 2;
- }
- else
- {
- yyp++;
- yyf++;
- }
- }
- }
+ {
+ /* Avoid sprintf, as that infringes on the user's name space.
+ Don't have undefined behavior even if the translation
+ produced a string with the wrong number of "%s"s. */
+ char *yyp = yyresult;
+ int yyi = 0;
+ while ((*yyp = *yyf) != '\0')
+ {
+ if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+ {
+ yyp += yytnamerr (yyp, yyarg[yyi++]);
+ yyf += 2;
+ }
+ else
+ {
+ yyp++;
+ yyf++;
+ }
+ }
+ }
return yysize;
}
}
@@ -1104,7 +1104,7 @@ yydestruct (yymsg, yytype, yyvaluep)
{
default:
- break;
+ break;
}
}
@@ -1217,7 +1217,7 @@ yyparse ()
yystate = 0;
yyerrstatus = 0;
yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
+ yychar = YYEMPTY; /* Cause a token to be read. */
/* Initialize stack pointers.
Waste one element of value and location stack
@@ -1247,25 +1247,25 @@ yyparse ()
#ifdef yyoverflow
{
- /* Give user a chance to reallocate the stack. Use copies of
- these so that the &'s don't force the real ones into
- memory. */
- YYSTYPE *yyvs1 = yyvs;
- yytype_int16 *yyss1 = yyss;
+ /* Give user a chance to reallocate the stack. Use copies of
+ these so that the &'s don't force the real ones into
+ memory. */
+ YYSTYPE *yyvs1 = yyvs;
+ yytype_int16 *yyss1 = yyss;
- /* Each stack pointer address is followed by the size of the
- data in use in that stack, in bytes. This used to be a
- conditional around just the two extra args, but that might
- be undefined if yyoverflow is a macro. */
- yyoverflow (YY_("memory exhausted"),
- &yyss1, yysize * sizeof (*yyssp),
- &yyvs1, yysize * sizeof (*yyvsp),
+ /* Each stack pointer address is followed by the size of the
+ data in use in that stack, in bytes. This used to be a
+ conditional around just the two extra args, but that might
+ be undefined if yyoverflow is a macro. */
+ yyoverflow (YY_("memory exhausted"),
+ &yyss1, yysize * sizeof (*yyssp),
+ &yyvs1, yysize * sizeof (*yyvsp),
- &yystacksize);
+ &yystacksize);
- yyss = yyss1;
- yyvs = yyvs1;
+ yyss = yyss1;
+ yyvs = yyvs1;
}
#else /* no yyoverflow */
# ifndef YYSTACK_RELOCATE
@@ -1273,23 +1273,23 @@ yyparse ()
# else
/* Extend the stack our own way. */
if (YYMAXDEPTH <= yystacksize)
- goto yyexhaustedlab;
+ goto yyexhaustedlab;
yystacksize *= 2;
if (YYMAXDEPTH < yystacksize)
- yystacksize = YYMAXDEPTH;
+ yystacksize = YYMAXDEPTH;
{
- yytype_int16 *yyss1 = yyss;
- union yyalloc *yyptr =
- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
- if (! yyptr)
- goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss);
- YYSTACK_RELOCATE (yyvs);
+ yytype_int16 *yyss1 = yyss;
+ union yyalloc *yyptr =
+ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+ if (! yyptr)
+ goto yyexhaustedlab;
+ YYSTACK_RELOCATE (yyss);
+ YYSTACK_RELOCATE (yyvs);
# undef YYSTACK_RELOCATE
- if (yyss1 != yyssa)
- YYSTACK_FREE (yyss1);
+ if (yyss1 != yyssa)
+ YYSTACK_FREE (yyss1);
}
# endif
#endif /* no yyoverflow */
@@ -1299,10 +1299,10 @@ yyparse ()
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
- (unsigned long int) yystacksize));
+ (unsigned long int) yystacksize));
if (yyss + yystacksize - 1 <= yyssp)
- YYABORT;
+ YYABORT;
}
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -1351,7 +1351,7 @@ yybackup:
if (yyn <= 0)
{
if (yyn == 0 || yyn == YYTABLE_NINF)
- goto yyerrlab;
+ goto yyerrlab;
yyn = -yyn;
goto yyreduce;
}
@@ -1411,37 +1411,37 @@ yyreduce:
case 10:
#line 74 "imap_cern.y"
{
- MapInfo_t *info = get_map_info();
- g_strreplace(&info->default_url, (yyvsp[(2) - (2)].id));
+ MapInfo_t *info = get_map_info();
+ g_strreplace(&info->default_url, (yyvsp[(2) - (2)].id));
g_free ((yyvsp[(2) - (2)].id));
- }
+ }
break;
case 11:
#line 83 "imap_cern.y"
{
- gint x = (gint) (yyvsp[(3) - (12)].value);
- gint y = (gint) (yyvsp[(5) - (12)].value);
- gint width = (gint) fabs((yyvsp[(8) - (12)].value) - x);
- gint height = (gint) fabs((yyvsp[(10) - (12)].value) - y);
- current_object = create_rectangle(x, y, width, height);
- object_set_url(current_object, (yyvsp[(12) - (12)].id));
- add_shape(current_object);
+ gint x = (gint) (yyvsp[(3) - (12)].value);
+ gint y = (gint) (yyvsp[(5) - (12)].value);
+ gint width = (gint) fabs((yyvsp[(8) - (12)].value) - x);
+ gint height = (gint) fabs((yyvsp[(10) - (12)].value) - y);
+ current_object = create_rectangle(x, y, width, height);
+ object_set_url(current_object, (yyvsp[(12) - (12)].id));
+ add_shape(current_object);
g_free ((yyvsp[(12) - (12)].id));
- }
+ }
break;
case 12:
#line 96 "imap_cern.y"
{
- gint x = (gint) (yyvsp[(3) - (8)].value);
- gint y = (gint) (yyvsp[(5) - (8)].value);
- gint r = (gint) (yyvsp[(7) - (8)].value);
- current_object = create_circle(x, y, r);
- object_set_url(current_object, (yyvsp[(8) - (8)].id));
- add_shape(current_object);
+ gint x = (gint) (yyvsp[(3) - (8)].value);
+ gint y = (gint) (yyvsp[(5) - (8)].value);
+ gint r = (gint) (yyvsp[(7) - (8)].value);
+ current_object = create_circle(x, y, r);
+ object_set_url(current_object, (yyvsp[(8) - (8)].id));
+ add_shape(current_object);
g_free ((yyvsp[(8) - (8)].id));
- }
+ }
break;
case 13:
@@ -1452,55 +1452,55 @@ yyreduce:
case 14:
#line 108 "imap_cern.y"
{
- object_set_url(current_object, (yyvsp[(4) - (4)].id));
- add_shape(current_object);
+ object_set_url(current_object, (yyvsp[(4) - (4)].id));
+ add_shape(current_object);
g_free ((yyvsp[(4) - (4)].id));
- }
+ }
break;
case 16:
#line 117 "imap_cern.y"
{
- }
+ }
break;
case 17:
#line 122 "imap_cern.y"
{
- Polygon_t *polygon = ObjectToPolygon(current_object);
- GdkPoint *point = new_point((gint) (yyvsp[(2) - (5)].value), (gint) (yyvsp[(4) - (5)].value));
- polygon->points = g_list_append(polygon->points,
- (gpointer) point);
- }
+ Polygon_t *polygon = ObjectToPolygon(current_object);
+ GdkPoint *point = new_point((gint) (yyvsp[(2) - (5)].value), (gint) (yyvsp[(4) - (5)].value));
+ polygon->points = g_list_append(polygon->points,
+ (gpointer) point);
+ }
break;
case 21:
#line 136 "imap_cern.y"
{
- g_free ((yyvsp[(2) - (2)].id));
- }
+ g_free ((yyvsp[(2) - (2)].id));
+ }
break;
case 22:
#line 142 "imap_cern.y"
{
- MapInfo_t *info = get_map_info();
- g_strreplace(&info->author, (yyvsp[(2) - (2)].id));
- g_free ((yyvsp[(2) - (2)].id));
- }
+ MapInfo_t *info = get_map_info();
+ g_strreplace(&info->author, (yyvsp[(2) - (2)].id));
+ g_free ((yyvsp[(2) - (2)].id));
+ }
break;
case 23:
#line 150 "imap_cern.y"
{
- MapInfo_t *info = get_map_info();
- gchar *description;
-
- description = g_strconcat(info->description, (yyvsp[(2) - (2)].id), "\n",
- NULL);
- g_strreplace(&info->description, description);
- g_free ((yyvsp[(2) - (2)].id));
- }
+ MapInfo_t *info = get_map_info();
+ gchar *description;
+
+ description = g_strconcat(info->description, (yyvsp[(2) - (2)].id), "\n",
+ NULL);
+ g_strreplace(&info->description, description);
+ g_free ((yyvsp[(2) - (2)].id));
+ }
break;
@@ -1544,35 +1544,35 @@ yyerrlab:
yyerror (YY_("syntax error"));
#else
{
- YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
- if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
- {
- YYSIZE_T yyalloc = 2 * yysize;
- if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
- yyalloc = YYSTACK_ALLOC_MAXIMUM;
- if (yymsg != yymsgbuf)
- YYSTACK_FREE (yymsg);
- yymsg = (char *) YYSTACK_ALLOC (yyalloc);
- if (yymsg)
- yymsg_alloc = yyalloc;
- else
- {
- yymsg = yymsgbuf;
- yymsg_alloc = sizeof yymsgbuf;
- }
- }
-
- if (0 < yysize && yysize <= yymsg_alloc)
- {
- (void) yysyntax_error (yymsg, yystate, yychar);
- yyerror (yymsg);
- }
- else
- {
- yyerror (YY_("syntax error"));
- if (yysize != 0)
- goto yyexhaustedlab;
- }
+ YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+ if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+ {
+ YYSIZE_T yyalloc = 2 * yysize;
+ if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+ yyalloc = YYSTACK_ALLOC_MAXIMUM;
+ if (yymsg != yymsgbuf)
+ YYSTACK_FREE (yymsg);
+ yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+ if (yymsg)
+ yymsg_alloc = yyalloc;
+ else
+ {
+ yymsg = yymsgbuf;
+ yymsg_alloc = sizeof yymsgbuf;
+ }
+ }
+
+ if (0 < yysize && yysize <= yymsg_alloc)
+ {
+ (void) yysyntax_error (yymsg, yystate, yychar);
+ yyerror (yymsg);
+ }
+ else
+ {
+ yyerror (YY_("syntax error"));
+ if (yysize != 0)
+ goto yyexhaustedlab;
+ }
}
#endif
}
@@ -1582,20 +1582,20 @@ yyerrlab:
if (yyerrstatus == 3)
{
/* If just tried and failed to reuse look-ahead token after an
- error, discard it. */
+ error, discard it. */
if (yychar <= YYEOF)
- {
- /* Return failure if at end of input. */
- if (yychar == YYEOF)
- YYABORT;
- }
+ {
+ /* Return failure if at end of input. */
+ if (yychar == YYEOF)
+ YYABORT;
+ }
else
- {
- yydestruct ("Error: discarding",
- yytoken, &yylval);
- yychar = YYEMPTY;
- }
+ {
+ yydestruct ("Error: discarding",
+ yytoken, &yylval);
+ yychar = YYEMPTY;
+ }
}
/* Else will try to reuse look-ahead token after shifting the error
@@ -1627,29 +1627,29 @@ yyerrorlab:
| yyerrlab1 -- common code for both syntax error and YYERROR. |
`-------------------------------------------------------------*/
yyerrlab1:
- yyerrstatus = 3; /* Each real token shifted decrements this. */
+ yyerrstatus = 3; /* Each real token shifted decrements this. */
for (;;)
{
yyn = yypact[yystate];
if (yyn != YYPACT_NINF)
- {
- yyn += YYTERROR;
- if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
- {
- yyn = yytable[yyn];
- if (0 < yyn)
- break;
- }
- }
+ {
+ yyn += YYTERROR;
+ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+ {
+ yyn = yytable[yyn];
+ if (0 < yyn)
+ break;
+ }
+ }
/* Pop the current state because it cannot handle the error token. */
if (yyssp == yyss)
- YYABORT;
+ YYABORT;
yydestruct ("Error: popping",
- yystos[yystate], yyvsp);
+ yystos[yystate], yyvsp);
YYPOPSTACK (1);
yystate = *yyssp;
YY_STACK_PRINT (yyss, yyssp);
@@ -1695,7 +1695,7 @@ yyexhaustedlab:
yyreturn:
if (yychar != YYEOF && yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead",
- yytoken, &yylval);
+ yytoken, &yylval);
/* Do not reclaim the symbols of the rule which action triggered
this YYABORT or YYACCEPT. */
YYPOPSTACK (yylen);
@@ -1703,7 +1703,7 @@ yyreturn:
while (yyssp != yyss)
{
yydestruct ("Cleanup: popping",
- yystos[*yyssp], yyvsp);
+ yystos[*yyssp], yyvsp);
YYPOPSTACK (1);
}
#ifndef yyoverflow
diff --git a/plug-ins/imagemap/imap_cern_parse.h b/plug-ins/imagemap/imap_cern_parse.h
index 5f6c0ca..79265d4 100644
--- a/plug-ins/imagemap/imap_cern_parse.h
+++ b/plug-ins/imagemap/imap_cern_parse.h
@@ -76,7 +76,7 @@ typedef union YYSTYPE
}
/* Line 1489 of yacc.c. */
#line 79 "y.tab.h"
- YYSTYPE;
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
diff --git a/plug-ins/imagemap/imap_circle.c b/plug-ins/imagemap/imap_circle.c
index 34de55d..c31da7f 100644
--- a/plug-ins/imagemap/imap_circle.c
+++ b/plug-ins/imagemap/imap_circle.c
@@ -44,7 +44,7 @@ static void circle_draw_sashes(Object_t* obj, GdkWindow *window, GdkGC* gc);
static MoveSashFunc_t circle_near_sash(Object_t *obj, gint x, gint y);
static gboolean circle_point_is_on(Object_t *obj, gint x, gint y);
static void circle_get_dimensions(Object_t *obj, gint *x, gint *y,
- gint *width, gint *height);
+ gint *width, gint *height);
static void circle_resize(Object_t *obj, gint percentage_x, gint percentage_y);
static void circle_move(Object_t *obj, gint dx, gint dy);
static gpointer circle_create_info_widget(GtkWidget *frame);
@@ -52,24 +52,24 @@ static void circle_fill_info_tab(Object_t *obj, gpointer data);
static void circle_set_initial_focus(Object_t *obj, gpointer data);
static void circle_update(Object_t* obj, gpointer data);
static void circle_write_csim(Object_t* obj, gpointer param,
- OutputFunc_t output);
+ OutputFunc_t output);
static void circle_write_cern(Object_t* obj, gpointer param,
- OutputFunc_t output);
+ OutputFunc_t output);
static void circle_write_ncsa(Object_t* obj, gpointer param,
- OutputFunc_t output);
+ OutputFunc_t output);
static const gchar* circle_get_stock_icon_name(void);
static ObjectClass_t circle_class = {
N_("C_ircle"),
- NULL, /* info_dialog */
- NULL, /* icon */
- NULL, /* mask */
+ NULL, /* info_dialog */
+ NULL, /* icon */
+ NULL, /* mask */
circle_is_valid,
- NULL, /* circle_destruct */
+ NULL, /* circle_destruct */
circle_clone,
circle_assign,
- NULL, /* circle_normalize */
+ NULL, /* circle_normalize */
circle_draw,
circle_draw_sashes,
circle_near_sash,
@@ -78,7 +78,7 @@ static ObjectClass_t circle_class = {
circle_resize,
circle_move,
circle_create_info_widget,
- circle_fill_info_tab, /* circle_update_info_widget */
+ circle_fill_info_tab, /* circle_update_info_widget */
circle_fill_info_tab,
circle_set_initial_focus,
circle_update,
@@ -167,7 +167,7 @@ circle_resize(Object_t *obj, gint percentage_x, gint percentage_y)
circle->x = circle->x * percentage_x / 100;
circle->y = circle->y * percentage_y / 100;
circle->r = circle->r * ((percentage_x < percentage_y)
- ? percentage_x : percentage_y) / 100;
+ ? percentage_x : percentage_y) / 100;
}
static MoveSashFunc_t
@@ -195,7 +195,7 @@ circle_point_is_on(Object_t *obj, gint x, gint y)
static void
circle_get_dimensions(Object_t *obj, gint *x, gint *y,
- gint *width, gint *height)
+ gint *width, gint *height)
{
Circle_t *circle = ObjectToCircle(obj);
*x = circle->x - circle->r;
@@ -262,14 +262,14 @@ circle_create_info_widget(GtkWidget *frame)
label = create_label_in_table(table, 0, 0, _("Center _x:"));
props->x = create_spin_button_in_table(table, label, 0, 1, 1, 0,
- max_width - 1);
+ max_width - 1);
g_signal_connect(props->x, "value-changed",
G_CALLBACK (x_changed_cb), (gpointer) props);
create_label_in_table(table, 0, 2, _("pixels"));
label = create_label_in_table(table, 1, 0, _("Center _y:"));
props->y = create_spin_button_in_table(table, label, 1, 1, 1, 0,
- max_height - 1);
+ max_height - 1);
g_signal_connect(props->y, "value-changed",
G_CALLBACK (y_changed_cb), (gpointer) props);
create_label_in_table(table, 1, 2, _("pixels"));
@@ -318,7 +318,7 @@ circle_write_csim(Object_t *obj, gpointer param, OutputFunc_t output)
{
Circle_t *circle = ObjectToCircle(obj);
output(param, "\"circle\" coords=\"%d,%d,%d\"", circle->x, circle->y,
- circle->r);
+ circle->r);
}
static void
@@ -333,7 +333,7 @@ circle_write_ncsa(Object_t *obj, gpointer param, OutputFunc_t output)
{
Circle_t *circle = ObjectToCircle(obj);
output(param, "circle %s %d,%d %d,%d", obj->url,
- circle->x, circle->y, circle->x, circle->y + circle->r);
+ circle->x, circle->y, circle->x, circle->y + circle->r);
}
static const gchar*
@@ -367,9 +367,9 @@ circle_factory_set_xy1(Object_t *obj, guint state, gint x, gint y)
}
static ObjectFactory_t circle_factory1 = {
- NULL, /* Object pointer */
- NULL, /* Finish func */
- NULL, /* Cancel func */
+ NULL, /* Object pointer */
+ NULL, /* Finish func */
+ NULL, /* Cancel func */
circle_factory_create_object1,
circle_factory_set_xy1
};
@@ -393,9 +393,9 @@ circle_factory_set_xy2(Object_t *obj, guint state, gint x, gint y)
}
static ObjectFactory_t circle_factory2 = {
- NULL, /* Object pointer */
- NULL, /* Finish func */
- NULL, /* Cancel func */
+ NULL, /* Object pointer */
+ NULL, /* Finish func */
+ NULL, /* Cancel func */
circle_factory_create_object2,
circle_factory_set_xy2
};
diff --git a/plug-ins/imagemap/imap_cmd_clear.c b/plug-ins/imagemap/imap_cmd_clear.c
index edd40e7..ac1cd3e 100644
--- a/plug-ins/imagemap/imap_cmd_clear.c
+++ b/plug-ins/imagemap/imap_cmd_clear.c
@@ -31,15 +31,15 @@
static CmdExecuteValue_t clear_command_execute(Command_t *parent);
static CommandClass_t clear_command_class = {
- NULL, /* clear_command_destruct */
+ NULL, /* clear_command_destruct */
clear_command_execute,
- NULL, /* clear_command_undo */
- NULL /* clear_command_redo */
+ NULL, /* clear_command_undo */
+ NULL /* clear_command_redo */
};
typedef struct {
- Command_t parent;
- ObjectList_t *list;
+ Command_t parent;
+ ObjectList_t *list;
} ClearCommand_t;
Command_t*
@@ -55,7 +55,7 @@ remove_one_object(Object_t *obj, gpointer data)
{
ClearCommand_t *command = (ClearCommand_t*) data;
command_add_subcommand(&command->parent,
- delete_command_new(command->list, obj));
+ delete_command_new(command->list, obj));
}
static CmdExecuteValue_t
diff --git a/plug-ins/imagemap/imap_cmd_copy.c b/plug-ins/imagemap/imap_cmd_copy.c
index 51ce608..a80b37b 100644
--- a/plug-ins/imagemap/imap_cmd_copy.c
+++ b/plug-ins/imagemap/imap_cmd_copy.c
@@ -32,10 +32,10 @@ static CmdExecuteValue_t copy_command_execute(Command_t *parent);
static void copy_command_undo(Command_t *parent);
static CommandClass_t copy_command_class = {
- NULL, /* copy_command_destruct */
+ NULL, /* copy_command_destruct */
copy_command_execute,
copy_command_undo,
- NULL /* copy_command_redo */
+ NULL /* copy_command_redo */
};
typedef struct {
@@ -58,7 +58,7 @@ copy_command_execute(Command_t *parent)
{
CopyCommand_t *command = (CopyCommand_t*) parent;
command->paste_buffer = object_list_copy(command->paste_buffer,
- get_paste_buffer());
+ get_paste_buffer());
object_list_copy_to_paste_buffer(command->list);
return CMD_APPEND;
}
diff --git a/plug-ins/imagemap/imap_cmd_copy_object.c b/plug-ins/imagemap/imap_cmd_copy_object.c
index b4e55a8..cd26539 100644
--- a/plug-ins/imagemap/imap_cmd_copy_object.c
+++ b/plug-ins/imagemap/imap_cmd_copy_object.c
@@ -36,12 +36,12 @@ static CommandClass_t copy_object_command_class = {
copy_object_command_destruct,
copy_object_command_execute,
copy_object_command_undo,
- NULL /* copy_object_command_redo */
+ NULL /* copy_object_command_redo */
};
typedef struct {
Command_t parent;
- Object_t *obj;
+ Object_t *obj;
ObjectList_t *paste_buffer;
} CopyObjectCommand_t;
@@ -52,7 +52,7 @@ copy_object_command_new(Object_t *obj)
command->obj = object_ref(obj);
command->paste_buffer = NULL;
return command_init(&command->parent, _("Copy"),
- ©_object_command_class);
+ ©_object_command_class);
}
static void
@@ -69,7 +69,7 @@ copy_object_command_execute(Command_t *parent)
ObjectList_t *paste_buffer = get_paste_buffer();
command->paste_buffer = object_list_copy(command->paste_buffer,
- paste_buffer);
+ paste_buffer);
clear_paste_buffer();
object_list_append(paste_buffer, object_clone(command->obj));
diff --git a/plug-ins/imagemap/imap_cmd_create.c b/plug-ins/imagemap/imap_cmd_create.c
index 1a6afab..7aa48ba 100644
--- a/plug-ins/imagemap/imap_cmd_create.c
+++ b/plug-ins/imagemap/imap_cmd_create.c
@@ -38,14 +38,14 @@ static CommandClass_t create_command_class = {
create_command_destruct,
create_command_execute,
create_command_undo,
- NULL /* create_command_redo */
+ NULL /* create_command_redo */
};
typedef struct {
- Command_t parent;
+ Command_t parent;
ObjectList_t *list;
- Object_t *obj;
- gboolean changed;
+ Object_t *obj;
+ gboolean changed;
} CreateCommand_t;
Command_t*
diff --git a/plug-ins/imagemap/imap_cmd_cut.c b/plug-ins/imagemap/imap_cmd_cut.c
index 3e45902..1e28933 100644
--- a/plug-ins/imagemap/imap_cmd_cut.c
+++ b/plug-ins/imagemap/imap_cmd_cut.c
@@ -36,11 +36,11 @@ static CommandClass_t cut_command_class = {
cut_command_destruct,
cut_command_execute,
cut_command_undo,
- NULL /* cut_command_redo */
+ NULL /* cut_command_redo */
};
typedef struct {
- Command_t parent;
+ Command_t parent;
ObjectList_t *list;
ObjectList_t *paste_buffer;
} CutCommand_t;
@@ -66,7 +66,7 @@ remove_one_object(Object_t *obj, gpointer data)
{
CutCommand_t *command = (CutCommand_t*) data;
command_add_subcommand(&command->parent,
- delete_command_new(command->list, obj));
+ delete_command_new(command->list, obj));
}
static CmdExecuteValue_t
@@ -76,7 +76,7 @@ cut_command_execute(Command_t *parent)
gpointer id;
command->paste_buffer = object_list_copy(command->paste_buffer,
- get_paste_buffer());
+ get_paste_buffer());
id = object_list_add_remove_cb(command->list, remove_one_object, command);
object_list_cut(command->list);
object_list_remove_remove_cb(command->list, id);
diff --git a/plug-ins/imagemap/imap_cmd_cut_object.c b/plug-ins/imagemap/imap_cmd_cut_object.c
index 577e19c..daf89ed 100644
--- a/plug-ins/imagemap/imap_cmd_cut_object.c
+++ b/plug-ins/imagemap/imap_cmd_cut_object.c
@@ -31,10 +31,10 @@
static CmdExecuteValue_t cut_object_command_execute(Command_t *parent);
static CommandClass_t cut_object_command_class = {
- NULL, /* cut_object_command_destruct */
+ NULL, /* cut_object_command_destruct */
cut_object_command_execute,
- NULL, /* cut_object_command_undo */
- NULL /* cut_object_command_redo */
+ NULL, /* cut_object_command_undo */
+ NULL /* cut_object_command_redo */
};
typedef struct {
@@ -48,7 +48,7 @@ cut_object_command_new(Object_t *obj)
Command_t *parent;
parent = command_init(&command->parent, _("Cut"),
- &cut_object_command_class);
+ &cut_object_command_class);
command_add_subcommand(parent, copy_object_command_new(obj));
command_add_subcommand(parent, delete_command_new(obj->list, obj));
diff --git a/plug-ins/imagemap/imap_cmd_delete.c b/plug-ins/imagemap/imap_cmd_delete.c
index 42a5a20..c7b53d7 100644
--- a/plug-ins/imagemap/imap_cmd_delete.c
+++ b/plug-ins/imagemap/imap_cmd_delete.c
@@ -36,15 +36,15 @@ static CommandClass_t delete_command_class = {
delete_command_destruct,
delete_command_execute,
delete_command_undo,
- NULL /* delete_command_redo */
+ NULL /* delete_command_redo */
};
typedef struct {
Command_t parent;
ObjectList_t *list;
Object_t *obj;
- gint position;
- gboolean changed;
+ gint position;
+ gboolean changed;
} DeleteCommand_t;
Command_t*
@@ -54,7 +54,7 @@ delete_command_new(ObjectList_t *list, Object_t *obj)
command->list = list;
command->obj = object_ref(obj);
return command_init(&command->parent, _("Delete"),
- &delete_command_class);
+ &delete_command_class);
}
static void
diff --git a/plug-ins/imagemap/imap_cmd_delete_point.c b/plug-ins/imagemap/imap_cmd_delete_point.c
index e13a56d..3ffe52e 100644
--- a/plug-ins/imagemap/imap_cmd_delete_point.c
+++ b/plug-ins/imagemap/imap_cmd_delete_point.c
@@ -33,18 +33,18 @@ static CmdExecuteValue_t delete_point_command_execute(Command_t *parent);
static void delete_point_command_undo(Command_t *parent);
static CommandClass_t delete_point_command_class = {
- NULL, /* delete_point_command_destruct */
+ NULL, /* delete_point_command_destruct */
delete_point_command_execute,
delete_point_command_undo,
- NULL /* delete_point_command_redo */
+ NULL /* delete_point_command_redo */
};
typedef struct {
- Command_t parent;
+ Command_t parent;
Polygon_t *polygon;
GdkPoint *point;
- GdkPoint copy;
- gint position;
+ GdkPoint copy;
+ gint position;
} DeletePointCommand_t;
Command_t*
@@ -56,9 +56,9 @@ delete_point_command_new(Object_t *obj, GdkPoint *point)
command->point = point;
command->copy = *point;
command->position = g_list_index(command->polygon->points,
- (gpointer) point);
+ (gpointer) point);
return command_init(&command->parent, _("Delete Point"),
- &delete_point_command_class);
+ &delete_point_command_class);
}
static CmdExecuteValue_t
@@ -82,5 +82,5 @@ delete_point_command_undo(Command_t *parent)
command->point = new_point(point->x, point->y);
polygon->points = g_list_insert(polygon->points, (gpointer) command->point,
- command->position);
+ command->position);
}
diff --git a/plug-ins/imagemap/imap_cmd_edit_object.c b/plug-ins/imagemap/imap_cmd_edit_object.c
index 8420247..06c4938 100644
--- a/plug-ins/imagemap/imap_cmd_edit_object.c
+++ b/plug-ins/imagemap/imap_cmd_edit_object.c
@@ -33,7 +33,7 @@ static void edit_object_command_undo(Command_t *parent);
static CommandClass_t edit_object_command_class = {
edit_object_command_destruct,
- NULL, /* edit_object_command_execute */
+ NULL, /* edit_object_command_execute */
edit_object_command_undo,
edit_object_command_undo
};
@@ -51,7 +51,7 @@ edit_object_command_new(Object_t *obj)
command->obj = object_ref(obj);
command->copy = object_clone(obj);
return command_init(&command->parent, _("Edit Object"),
- &edit_object_command_class);
+ &edit_object_command_class);
}
static void
diff --git a/plug-ins/imagemap/imap_cmd_gimp_guides.c b/plug-ins/imagemap/imap_cmd_gimp_guides.c
index 5bec647..abc72f2 100644
--- a/plug-ins/imagemap/imap_cmd_gimp_guides.c
+++ b/plug-ins/imagemap/imap_cmd_gimp_guides.c
@@ -38,18 +38,18 @@
#include "libgimp/stdplugins-intl.h"
typedef struct {
- DefaultDialog_t *dialog;
-
- ObjectList_t *list;
- GimpDrawable *drawable;
-
- GtkWidget *alternate;
- GtkWidget *all;
- GtkWidget *left_border;
- GtkWidget *right_border;
- GtkWidget *upper_border;
- GtkWidget *lower_border;
- GtkWidget *url;
+ DefaultDialog_t *dialog;
+
+ ObjectList_t *list;
+ GimpDrawable *drawable;
+
+ GtkWidget *alternate;
+ GtkWidget *all;
+ GtkWidget *left_border;
+ GtkWidget *right_border;
+ GtkWidget *upper_border;
+ GtkWidget *lower_border;
+ GtkWidget *url;
} GimpGuidesDialog_t;
static gint
@@ -80,7 +80,7 @@ gimp_guides_ok_cb(gpointer data)
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(param->right_border)))
vguides = g_slist_append(vguides,
- GINT_TO_POINTER(gimp_image_width(image_ID)));
+ GINT_TO_POINTER(gimp_image_width(image_ID)));
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(param->upper_border)))
hguides = g_slist_append(NULL, GINT_TO_POINTER(0));
@@ -89,7 +89,7 @@ gimp_guides_ok_cb(gpointer data)
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(param->lower_border)))
hguides = g_slist_append(hguides,
- GINT_TO_POINTER(gimp_image_height(image_ID)));
+ GINT_TO_POINTER(gimp_image_height(image_ID)));
url = gtk_entry_get_text(GTK_ENTRY(param->url));
@@ -101,12 +101,12 @@ gimp_guides_ok_cb(gpointer data)
gint position = gimp_image_get_guide_position(image_ID, guide_num);
if (gimp_image_get_guide_orientation(image_ID, guide_num)
- == GIMP_ORIENTATION_HORIZONTAL) {
- hguides = g_slist_insert_sorted(hguides, GINT_TO_POINTER(position),
- guide_sort_func);
- } else { /* GIMP_ORIENTATION_VERTICAL */
- vguides = g_slist_insert_sorted(vguides, GINT_TO_POINTER(position),
- guide_sort_func);
+ == GIMP_ORIENTATION_HORIZONTAL) {
+ hguides = g_slist_insert_sorted(hguides, GINT_TO_POINTER(position),
+ guide_sort_func);
+ } else { /* GIMP_ORIENTATION_VERTICAL */
+ vguides = g_slist_insert_sorted(vguides, GINT_TO_POINTER(position),
+ guide_sort_func);
}
guide_num = gimp_image_find_next_guide(image_ID, guide_num);
}
@@ -116,18 +116,18 @@ gimp_guides_ok_cb(gpointer data)
subcommand_start(_("Use Gimp Guides"));
for (hg = hguides; hg && hg->next;
- hg = (all) ? hg->next : hg->next->next) {
+ hg = (all) ? hg->next : hg->next->next) {
gint y = GPOINTER_TO_INT(hg->data);
gint height = GPOINTER_TO_INT(hg->next->data) - y;
for (vg = vguides; vg && vg->next;
- vg = (all) ? vg->next : vg->next->next) {
- gint x = GPOINTER_TO_INT(vg->data);
- gint width = GPOINTER_TO_INT(vg->next->data) - x;
- Object_t *obj = create_rectangle(x, y, width, height);
- Command_t *command = create_command_new(param->list, obj);
-
- object_set_url(obj, url);
- command_execute(command);
+ vg = (all) ? vg->next : vg->next->next) {
+ gint x = GPOINTER_TO_INT(vg->data);
+ gint width = GPOINTER_TO_INT(vg->next->data) - x;
+ Object_t *obj = create_rectangle(x, y, width, height);
+ Command_t *command = create_command_new(param->list, obj);
+
+ object_set_url(obj, url);
+ command_execute(command);
}
}
@@ -208,7 +208,7 @@ make_gimp_guides_dialog(void)
static void
init_gimp_guides_dialog(GimpGuidesDialog_t *dialog, ObjectList_t *list,
- GimpDrawable *drawable)
+ GimpDrawable *drawable)
{
dialog->list = list;
dialog->drawable = drawable;
@@ -229,10 +229,10 @@ do_create_gimp_guides_dialog(ObjectList_t *list, GimpDrawable *drawable)
static CmdExecuteValue_t gimp_guides_command_execute(Command_t *parent);
static CommandClass_t gimp_guides_command_class = {
- NULL, /* guides_command_destruct */
+ NULL, /* guides_command_destruct */
gimp_guides_command_execute,
- NULL, /* guides_command_undo */
- NULL /* guides_command_redo */
+ NULL, /* guides_command_undo */
+ NULL /* guides_command_redo */
};
typedef struct {
@@ -248,7 +248,7 @@ gimp_guides_command_new(ObjectList_t *list, GimpDrawable *drawable)
command->list = list;
command->drawable = drawable;
return command_init(&command->parent, _("Use Gimp Guides"),
- &gimp_guides_command_class);
+ &gimp_guides_command_class);
}
static CmdExecuteValue_t
diff --git a/plug-ins/imagemap/imap_cmd_guides.c b/plug-ins/imagemap/imap_cmd_guides.c
index b473a3b..9a4ceb9 100644
--- a/plug-ins/imagemap/imap_cmd_guides.c
+++ b/plug-ins/imagemap/imap_cmd_guides.c
@@ -35,20 +35,20 @@
#include "libgimp/stdplugins-intl.h"
typedef struct {
- DefaultDialog_t *dialog;
- GtkWidget *image_dimensions;
- GtkWidget *guide_bounds;
- GtkWidget *width;
- GtkWidget *height;
- GtkWidget *left;
- GtkWidget *top;
- GtkWidget *horz_spacing;
- GtkWidget *vert_spacing;
- GtkWidget *no_across;
- GtkWidget *no_down;
- GtkWidget *base_url;
-
- ObjectList_t *list;
+ DefaultDialog_t *dialog;
+ GtkWidget *image_dimensions;
+ GtkWidget *guide_bounds;
+ GtkWidget *width;
+ GtkWidget *height;
+ GtkWidget *left;
+ GtkWidget *top;
+ GtkWidget *horz_spacing;
+ GtkWidget *vert_spacing;
+ GtkWidget *no_across;
+ GtkWidget *no_down;
+ GtkWidget *base_url;
+
+ ObjectList_t *list;
} GuidesDialog_t;
static void
@@ -75,12 +75,12 @@ guides_ok_cb(gpointer data)
for (i = 0; i < rows; i++) {
gint x = left;
for (j = 0; j < cols; j++) {
- Object_t *obj = create_rectangle(x, y, width, height);
- Command_t *command = create_command_new(param->list, obj);
+ Object_t *obj = create_rectangle(x, y, width, height);
+ Command_t *command = create_command_new(param->list, obj);
- object_set_url(obj, gtk_entry_get_text(GTK_ENTRY(param->base_url)));
- command_execute(command);
- x += width + hspace;
+ object_set_url(obj, gtk_entry_get_text(GTK_ENTRY(param->base_url)));
+ command_execute(command);
+ x += width + hspace;
}
y += height + vspace;
}
@@ -110,7 +110,7 @@ recalc_bounds(GtkWidget *widget, gpointer data)
bound_h = (height + vspace) * rows - vspace;
bounds = g_strdup_printf (_("Resulting Guide Bounds: %d,%d to %d,%d (%d areas)"),
- left, top, left + bound_w, top + bound_h, rows * cols);
+ left, top, left + bound_w, top + bound_h, rows * cols);
if (left + bound_w > get_image_width() ||
top + bound_h > get_image_height())
{
@@ -141,9 +141,9 @@ make_guides_dialog (void)
hbox = gimp_hint_box_new (
_("Guides are pre-defined rectangles covering the image. You define "
- "them by their width, height, and spacing from each other. This "
- "allows you to rapidly create the most common image map type - "
- "image collection of \"thumbnails\", suitable for navigation bars."));
+ "them by their width, height, and spacing from each other. This "
+ "allows you to rapidly create the most common image map type - "
+ "image collection of \"thumbnails\", suitable for navigation bars."));
gtk_box_pack_start (GTK_BOX (dialog->vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
@@ -189,13 +189,13 @@ make_guides_dialog (void)
label = create_label_in_table(table, 2, 2, _("_No. across:"));
data->no_across = create_spin_button_in_table(table, label, 2, 3, 0, 0,
- 100);
+ 100);
g_signal_connect (data->no_across, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data);
label = create_label_in_table(table, 3, 0, _("_Vert. spacing:"));
data->vert_spacing = create_spin_button_in_table(table, label, 3, 1, 0, 0,
- 100);
+ 100);
g_signal_connect (data->vert_spacing, "changed",
G_CALLBACK(recalc_bounds), (gpointer) data);
@@ -252,10 +252,10 @@ do_create_guides_dialog_local (ObjectList_t *list)
static CmdExecuteValue_t guides_command_execute(Command_t *parent);
static CommandClass_t guides_command_class = {
- NULL, /* guides_command_destruct */
+ NULL, /* guides_command_destruct */
guides_command_execute,
- NULL, /* guides_command_undo */
- NULL /* guides_command_redo */
+ NULL, /* guides_command_undo */
+ NULL /* guides_command_redo */
};
typedef struct {
diff --git a/plug-ins/imagemap/imap_cmd_insert_point.c b/plug-ins/imagemap/imap_cmd_insert_point.c
index 8b76a6e..168b477 100644
--- a/plug-ins/imagemap/imap_cmd_insert_point.c
+++ b/plug-ins/imagemap/imap_cmd_insert_point.c
@@ -34,19 +34,19 @@ static CmdExecuteValue_t insert_point_command_execute(Command_t *parent);
static void insert_point_command_undo(Command_t *parent);
static CommandClass_t insert_point_command_class = {
- NULL, /* insert_point_command_destruct */
+ NULL, /* insert_point_command_destruct */
insert_point_command_execute,
insert_point_command_undo,
- NULL /* insert_point_command_redo */
+ NULL /* insert_point_command_redo */
};
typedef struct {
- Command_t parent;
+ Command_t parent;
Polygon_t *polygon;
- gint x;
- gint y;
- gint edge;
- gint position;
+ gint x;
+ gint y;
+ gint edge;
+ gint position;
} InsertPointCommand_t;
Command_t*
@@ -59,7 +59,7 @@ insert_point_command_new(Object_t *obj, gint x, gint y, gint edge)
command->y = y;
command->edge = edge;
return command_init(&command->parent, _("Insert Point"),
- &insert_point_command_class);
+ &insert_point_command_class);
}
static CmdExecuteValue_t
@@ -75,7 +75,7 @@ insert_point_command_execute(Command_t *parent)
command->position = command->edge - 1;
} else {
polygon->points = g_list_insert(polygon->points, (gpointer) point,
- command->edge);
+ command->edge);
command->position = command->edge;
}
redraw_preview();
@@ -92,5 +92,5 @@ insert_point_command_undo(Command_t *parent)
g_free(p->data);
polygon->points = g_list_remove_link(polygon->points, p);
- redraw_preview(); /* Fix me! */
+ redraw_preview(); /* Fix me! */
}
diff --git a/plug-ins/imagemap/imap_cmd_move.c b/plug-ins/imagemap/imap_cmd_move.c
index 991af4a..0f8cb1c 100644
--- a/plug-ins/imagemap/imap_cmd_move.c
+++ b/plug-ins/imagemap/imap_cmd_move.c
@@ -37,8 +37,8 @@ static CmdExecuteValue_t move_command_execute(Command_t *parent);
static CommandClass_t move_command_class = {
move_command_destruct,
move_command_execute,
- NULL, /* move_command_undo */
- NULL /* move_command_redo */
+ NULL, /* move_command_undo */
+ NULL /* move_command_redo */
};
typedef struct {
@@ -58,7 +58,7 @@ typedef struct {
gint image_width;
gint image_height;
- GdkCursorType cursor; /* Remember previous cursor */
+ GdkCursorType cursor; /* Remember previous cursor */
gboolean moved_first_time;
} MoveCommand_t;
@@ -73,7 +73,7 @@ move_command_new(Preview_t *preview, Object_t *obj, gint x, gint y)
command->start_x = x;
command->start_y = y;
object_get_dimensions(obj, &command->obj_x, &command->obj_y,
- &command->obj_width, &command->obj_height);
+ &command->obj_width, &command->obj_height);
command->obj_start_x = command->obj_x;
command->obj_start_y = command->obj_y;
@@ -149,7 +149,7 @@ button_release(GtkWidget *widget, GdkEventButton *event, gpointer data)
command->obj_y -= command->obj_start_y;
if (command->obj_x || command->obj_y)
command_list_add(object_move_command_new(command->obj, command->obj_x,
- command->obj_y));
+ command->obj_y));
/* preview_thaw(); */
}
diff --git a/plug-ins/imagemap/imap_cmd_move_down.c b/plug-ins/imagemap/imap_cmd_move_down.c
index e9a9d19..42f5860 100644
--- a/plug-ins/imagemap/imap_cmd_move_down.c
+++ b/plug-ins/imagemap/imap_cmd_move_down.c
@@ -31,10 +31,10 @@
static CmdExecuteValue_t move_down_command_execute(Command_t *parent);
static CommandClass_t move_down_command_class = {
- NULL, /* move_down_command_destruct */
+ NULL, /* move_down_command_destruct */
move_down_command_execute,
- NULL, /* move_down_command_undo */
- NULL /* move_down_command_redo */
+ NULL, /* move_down_command_undo */
+ NULL /* move_down_command_redo */
};
typedef struct {
@@ -50,7 +50,7 @@ move_down_command_new(ObjectList_t *list)
command->list = list;
command->add = FALSE;
return command_init(&command->parent, _("Move Down"),
- &move_down_command_class);
+ &move_down_command_class);
}
static void
@@ -60,7 +60,7 @@ move_down_one_object(Object_t *obj, gpointer data)
if (command->add) {
command_add_subcommand(&command->parent,
- object_down_command_new(command->list, obj));
+ object_down_command_new(command->list, obj));
command->add = FALSE;
}
else {
diff --git a/plug-ins/imagemap/imap_cmd_move_sash.c b/plug-ins/imagemap/imap_cmd_move_sash.c
index c7b7a25..6131e8c 100644
--- a/plug-ins/imagemap/imap_cmd_move_sash.c
+++ b/plug-ins/imagemap/imap_cmd_move_sash.c
@@ -40,19 +40,19 @@ static CommandClass_t move_sash_command_class = {
};
typedef struct {
- Command_t parent;
+ Command_t parent;
GtkWidget *widget;
Object_t *obj;
- gint x;
- gint y;
- gint image_width;
- gint image_height;
+ gint x;
+ gint y;
+ gint image_width;
+ gint image_height;
MoveSashFunc_t sash_func;
} MoveSashCommand_t;
Command_t*
move_sash_command_new(GtkWidget *widget, Object_t *obj,
- gint x, gint y, MoveSashFunc_t sash_func)
+ gint x, gint y, MoveSashFunc_t sash_func)
{
MoveSashCommand_t *command = g_new(MoveSashCommand_t, 1);
Command_t *parent;
@@ -66,7 +66,7 @@ move_sash_command_new(GtkWidget *widget, Object_t *obj,
command->sash_func = sash_func;
parent = command_init(&command->parent, _("Move Sash"),
- &move_sash_command_class);
+ &move_sash_command_class);
command_add_subcommand(parent, edit_object_command_new(obj));
return parent;
diff --git a/plug-ins/imagemap/imap_cmd_move_selected.c b/plug-ins/imagemap/imap_cmd_move_selected.c
index db7b58b..5c61473 100644
--- a/plug-ins/imagemap/imap_cmd_move_selected.c
+++ b/plug-ins/imagemap/imap_cmd_move_selected.c
@@ -32,10 +32,10 @@ static CmdExecuteValue_t move_selected_command_execute(Command_t *parent);
static void move_selected_command_undo(Command_t *parent);
static CommandClass_t move_selected_command_class = {
- NULL, /* move_selected_command_destruct */
+ NULL, /* move_selected_command_destruct */
move_selected_command_execute,
move_selected_command_undo,
- NULL /* move_selected_command_redo */
+ NULL /* move_selected_command_redo */
};
typedef struct {
@@ -53,7 +53,7 @@ move_selected_command_new(ObjectList_t *list, gint dx, gint dy)
command->dx = dx;
command->dy = dy;
return command_init(&command->parent, _("Move Selected Objects"),
- &move_selected_command_class);
+ &move_selected_command_class);
}
static CmdExecuteValue_t
diff --git a/plug-ins/imagemap/imap_cmd_move_to_front.c b/plug-ins/imagemap/imap_cmd_move_to_front.c
index 31d4c2a..ba93504 100644
--- a/plug-ins/imagemap/imap_cmd_move_to_front.c
+++ b/plug-ins/imagemap/imap_cmd_move_to_front.c
@@ -31,10 +31,10 @@
static CmdExecuteValue_t move_to_front_command_execute(Command_t *parent);
static CommandClass_t move_to_front_command_class = {
- NULL, /* move_to_front_command_destruct, */
+ NULL, /* move_to_front_command_destruct, */
move_to_front_command_execute,
- NULL, /* move_to_front_command_undo */
- NULL /* move_to_front_command_redo */
+ NULL, /* move_to_front_command_undo */
+ NULL /* move_to_front_command_redo */
};
typedef struct {
@@ -48,7 +48,7 @@ move_to_front_command_new(ObjectList_t *list)
MoveToFrontCommand_t *command = g_new(MoveToFrontCommand_t, 1);
command->list = list;
return command_init(&command->parent, _("Move To Front"),
- &move_to_front_command_class);
+ &move_to_front_command_class);
}
static void
@@ -56,7 +56,7 @@ remove_one_object(Object_t *obj, gpointer data)
{
MoveToFrontCommand_t *command = (MoveToFrontCommand_t*) data;
command_add_subcommand(&command->parent,
- delete_command_new(command->list, obj));
+ delete_command_new(command->list, obj));
}
static void
@@ -64,7 +64,7 @@ add_one_object(Object_t *obj, gpointer data)
{
MoveToFrontCommand_t *command = (MoveToFrontCommand_t*) data;
command_add_subcommand(&command->parent,
- create_command_new(command->list, obj));
+ create_command_new(command->list, obj));
}
static CmdExecuteValue_t
diff --git a/plug-ins/imagemap/imap_cmd_move_up.c b/plug-ins/imagemap/imap_cmd_move_up.c
index 99c0603..56a49fa 100644
--- a/plug-ins/imagemap/imap_cmd_move_up.c
+++ b/plug-ins/imagemap/imap_cmd_move_up.c
@@ -31,10 +31,10 @@
static CmdExecuteValue_t move_up_command_execute(Command_t *parent);
static CommandClass_t move_up_command_class = {
- NULL, /* move_up_command_destruct */
+ NULL, /* move_up_command_destruct */
move_up_command_execute,
- NULL, /* move_up_command_undo */
- NULL /* move_up_command_redo */
+ NULL, /* move_up_command_undo */
+ NULL /* move_up_command_redo */
};
typedef struct {
@@ -59,7 +59,7 @@ move_up_one_object(Object_t *obj, gpointer data)
if (command->add) {
command_add_subcommand(&command->parent,
- object_up_command_new(command->list, obj));
+ object_up_command_new(command->list, obj));
command->add = FALSE;
}
else {
diff --git a/plug-ins/imagemap/imap_cmd_object_down.c b/plug-ins/imagemap/imap_cmd_object_down.c
index ebcf046..b740145 100644
--- a/plug-ins/imagemap/imap_cmd_object_down.c
+++ b/plug-ins/imagemap/imap_cmd_object_down.c
@@ -36,7 +36,7 @@ static CommandClass_t object_down_command_class = {
object_down_command_destruct,
object_down_command_execute,
object_down_command_undo,
- NULL /* object_down_command_redo */
+ NULL /* object_down_command_redo */
};
typedef struct {
@@ -52,7 +52,7 @@ object_down_command_new(ObjectList_t *list, Object_t *obj)
command->list = list;
command->obj = object_ref(obj);
return command_init(&command->parent, _("Move Down"),
- &object_down_command_class);
+ &object_down_command_class);
}
static void
diff --git a/plug-ins/imagemap/imap_cmd_object_move.c b/plug-ins/imagemap/imap_cmd_object_move.c
index 717e511..d38ba69 100644
--- a/plug-ins/imagemap/imap_cmd_object_move.c
+++ b/plug-ins/imagemap/imap_cmd_object_move.c
@@ -36,7 +36,7 @@ static CommandClass_t object_move_command_class = {
object_move_command_destruct,
object_move_command_execute,
object_move_command_undo,
- NULL /* object_move_command_redo */
+ NULL /* object_move_command_redo */
};
typedef struct {
@@ -54,7 +54,7 @@ object_move_command_new(Object_t *obj, gint dx, gint dy)
command->dx = dx;
command->dy = dy;
return command_init(&command->parent, _("Move"),
- &object_move_command_class);
+ &object_move_command_class);
}
static void
diff --git a/plug-ins/imagemap/imap_cmd_object_up.c b/plug-ins/imagemap/imap_cmd_object_up.c
index d9826c8..6a81cb2 100644
--- a/plug-ins/imagemap/imap_cmd_object_up.c
+++ b/plug-ins/imagemap/imap_cmd_object_up.c
@@ -36,7 +36,7 @@ static CommandClass_t object_up_command_class = {
object_up_command_destruct,
object_up_command_execute,
object_up_command_undo,
- NULL /* object_up_command_redo */
+ NULL /* object_up_command_redo */
};
typedef struct {
@@ -52,7 +52,7 @@ object_up_command_new(ObjectList_t *list, Object_t *obj)
command->list = list;
command->obj = object_ref(obj);
return command_init(&command->parent, _("Move Up"),
- &object_up_command_class);
+ &object_up_command_class);
}
static void
diff --git a/plug-ins/imagemap/imap_cmd_paste.c b/plug-ins/imagemap/imap_cmd_paste.c
index fd94b55..8def860 100644
--- a/plug-ins/imagemap/imap_cmd_paste.c
+++ b/plug-ins/imagemap/imap_cmd_paste.c
@@ -31,10 +31,10 @@
static CmdExecuteValue_t paste_command_execute(Command_t *parent);
static CommandClass_t paste_command_class = {
- NULL, /* paste_command_destruct, */
+ NULL, /* paste_command_destruct, */
paste_command_execute,
- NULL, /* paste_command_undo */
- NULL /* paste_command_redo */
+ NULL, /* paste_command_undo */
+ NULL /* paste_command_redo */
};
typedef struct {
@@ -55,7 +55,7 @@ paste_one_object(Object_t *obj, gpointer data)
{
PasteCommand_t *command = (PasteCommand_t*) data;
command_add_subcommand(&command->parent,
- create_command_new(command->list, obj));
+ create_command_new(command->list, obj));
}
static CmdExecuteValue_t
diff --git a/plug-ins/imagemap/imap_cmd_select.c b/plug-ins/imagemap/imap_cmd_select.c
index c57f502..d63a769 100644
--- a/plug-ins/imagemap/imap_cmd_select.c
+++ b/plug-ins/imagemap/imap_cmd_select.c
@@ -36,7 +36,7 @@ static CommandClass_t select_command_class = {
select_command_destruct,
select_command_execute,
select_command_undo,
- NULL /* select_command_redo */
+ NULL /* select_command_redo */
};
typedef struct {
diff --git a/plug-ins/imagemap/imap_cmd_select_all.c b/plug-ins/imagemap/imap_cmd_select_all.c
index 995fd08..ea6986d 100644
--- a/plug-ins/imagemap/imap_cmd_select_all.c
+++ b/plug-ins/imagemap/imap_cmd_select_all.c
@@ -31,10 +31,10 @@
static CmdExecuteValue_t select_all_command_execute(Command_t *parent);
static CommandClass_t select_all_command_class = {
- NULL, /* select_all_command_destruct, */
+ NULL, /* select_all_command_destruct, */
select_all_command_execute,
- NULL, /* select_all_command_undo */
- NULL /* select_all_command_redo */
+ NULL, /* select_all_command_undo */
+ NULL /* select_all_command_redo */
};
typedef struct {
@@ -48,7 +48,7 @@ select_all_command_new(ObjectList_t *list)
SelectAllCommand_t *command = g_new(SelectAllCommand_t, 1);
command->list = list;
return command_init(&command->parent, _("Select All"),
- &select_all_command_class);
+ &select_all_command_class);
}
static void
diff --git a/plug-ins/imagemap/imap_cmd_select_next.c b/plug-ins/imagemap/imap_cmd_select_next.c
index baf3827..da384cd 100644
--- a/plug-ins/imagemap/imap_cmd_select_next.c
+++ b/plug-ins/imagemap/imap_cmd_select_next.c
@@ -31,10 +31,10 @@
static CmdExecuteValue_t select_next_command_execute(Command_t *parent);
static CommandClass_t select_next_command_class = {
- NULL, /* select_next_command_destruct */
+ NULL, /* select_next_command_destruct */
select_next_command_execute,
- NULL, /* select_next_command_undo */
- NULL /* select_next_command_redo */
+ NULL, /* select_next_command_undo */
+ NULL /* select_next_command_redo */
};
typedef struct {
@@ -48,7 +48,7 @@ select_next_command_new(ObjectList_t *list)
SelectNextCommand_t *command = g_new(SelectNextCommand_t, 1);
command->list = list;
return command_init(&command->parent, _("Select Next"),
- &select_next_command_class);
+ &select_next_command_class);
}
static void
diff --git a/plug-ins/imagemap/imap_cmd_select_prev.c b/plug-ins/imagemap/imap_cmd_select_prev.c
index 3ae0260..010bb6c 100644
--- a/plug-ins/imagemap/imap_cmd_select_prev.c
+++ b/plug-ins/imagemap/imap_cmd_select_prev.c
@@ -31,10 +31,10 @@
static CmdExecuteValue_t select_prev_command_execute(Command_t *parent);
static CommandClass_t select_prev_command_class = {
- NULL, /* select_prev_command_destruct */
+ NULL, /* select_prev_command_destruct */
select_prev_command_execute,
- NULL, /* select_prev_command_undo */
- NULL /* select_prev_command_redo */
+ NULL, /* select_prev_command_undo */
+ NULL /* select_prev_command_redo */
};
typedef struct {
@@ -48,7 +48,7 @@ select_prev_command_new(ObjectList_t *list)
SelectPrevCommand_t *command = g_new(SelectPrevCommand_t, 1);
command->list = list;
return command_init(&command->parent, _("Select Previous"),
- &select_prev_command_class);
+ &select_prev_command_class);
}
static void
diff --git a/plug-ins/imagemap/imap_cmd_select_region.c b/plug-ins/imagemap/imap_cmd_select_region.c
index edc2202..876ed38 100644
--- a/plug-ins/imagemap/imap_cmd_select_region.c
+++ b/plug-ins/imagemap/imap_cmd_select_region.c
@@ -33,25 +33,25 @@
static CmdExecuteValue_t select_region_command_execute(Command_t *parent);
static CommandClass_t select_region_command_class = {
- NULL, /* select_region_command_destruct, */
+ NULL, /* select_region_command_destruct, */
select_region_command_execute,
- NULL, /* select_region_command_undo */
- NULL /* select_region_command_redo */
+ NULL, /* select_region_command_undo */
+ NULL /* select_region_command_redo */
};
typedef struct {
- Command_t parent;
- GtkWidget *widget;
+ Command_t parent;
+ GtkWidget *widget;
ObjectList_t *list;
- gint x;
- gint y;
- Object_t *obj;
- Command_t *unselect_command;
+ gint x;
+ gint y;
+ Object_t *obj;
+ Command_t *unselect_command;
} SelectRegionCommand_t;
Command_t*
select_region_command_new(GtkWidget *widget, ObjectList_t *list, gint x,
- gint y)
+ gint y)
{
SelectRegionCommand_t *command = g_new(SelectRegionCommand_t, 1);
Command_t *sub_command;
@@ -61,7 +61,7 @@ select_region_command_new(GtkWidget *widget, ObjectList_t *list, gint x,
command->x = x;
command->y = y;
(void) command_init(&command->parent, _("Select Region"),
- &select_region_command_class);
+ &select_region_command_class);
sub_command = unselect_all_command_new(list, NULL);
command_add_subcommand(&command->parent, sub_command);
@@ -112,14 +112,14 @@ select_release(GtkWidget *widget, GdkEventButton *event, gpointer data)
id = object_list_add_select_cb(command->list, select_one_object, command);
count = object_list_select_region(command->list, rectangle->x, rectangle->y,
- rectangle->width, rectangle->height);
+ rectangle->width, rectangle->height);
object_list_remove_select_cb(command->list, id);
if (count) {
command_list_add(&command->parent);
- } else { /* Nothing selected */
+ } else { /* Nothing selected */
if (command->unselect_command->sub_commands)
- command_list_add(&command->parent);
+ command_list_add(&command->parent);
}
object_unref(obj);
}
diff --git a/plug-ins/imagemap/imap_cmd_send_to_back.c b/plug-ins/imagemap/imap_cmd_send_to_back.c
index 21bd487..8ab9fb4 100644
--- a/plug-ins/imagemap/imap_cmd_send_to_back.c
+++ b/plug-ins/imagemap/imap_cmd_send_to_back.c
@@ -31,10 +31,10 @@
static CmdExecuteValue_t send_to_back_command_execute(Command_t *parent);
static CommandClass_t send_to_back_command_class = {
- NULL, /* send_to_back_command_destruct, */
+ NULL, /* send_to_back_command_destruct, */
send_to_back_command_execute,
- NULL, /* send_to_back_command_undo */
- NULL /* send_to_back_command_redo */
+ NULL, /* send_to_back_command_undo */
+ NULL /* send_to_back_command_redo */
};
typedef struct {
@@ -48,7 +48,7 @@ send_to_back_command_new(ObjectList_t *list)
SendToBackCommand_t *command = g_new(SendToBackCommand_t, 1);
command->list = list;
return command_init(&command->parent, _("Send To Back"),
- &send_to_back_command_class);
+ &send_to_back_command_class);
}
static void
@@ -56,7 +56,7 @@ remove_one_object(Object_t *obj, gpointer data)
{
SendToBackCommand_t *command = (SendToBackCommand_t*) data;
command_add_subcommand(&command->parent,
- delete_command_new(command->list, obj));
+ delete_command_new(command->list, obj));
}
static void
@@ -64,7 +64,7 @@ add_one_object(Object_t *obj, gpointer data)
{
SendToBackCommand_t *command = (SendToBackCommand_t*) data;
command_add_subcommand(&command->parent,
- create_command_new(command->list, obj));
+ create_command_new(command->list, obj));
}
static CmdExecuteValue_t
diff --git a/plug-ins/imagemap/imap_cmd_unselect.c b/plug-ins/imagemap/imap_cmd_unselect.c
index d7af3ec..b5e05c5 100644
--- a/plug-ins/imagemap/imap_cmd_unselect.c
+++ b/plug-ins/imagemap/imap_cmd_unselect.c
@@ -36,7 +36,7 @@ static CommandClass_t unselect_command_class = {
unselect_command_destruct,
unselect_command_execute,
unselect_command_undo,
- NULL /* unselect_command_redo */
+ NULL /* unselect_command_redo */
};
typedef struct {
@@ -50,7 +50,7 @@ unselect_command_new(Object_t *obj)
UnselectCommand_t *command = g_new(UnselectCommand_t, 1);
command->obj = object_ref(obj);
return command_init(&command->parent, _("Unselect"),
- &unselect_command_class);
+ &unselect_command_class);
}
static void
diff --git a/plug-ins/imagemap/imap_cmd_unselect_all.c b/plug-ins/imagemap/imap_cmd_unselect_all.c
index 123980f..bdff5e6 100644
--- a/plug-ins/imagemap/imap_cmd_unselect_all.c
+++ b/plug-ins/imagemap/imap_cmd_unselect_all.c
@@ -36,8 +36,8 @@ static CmdExecuteValue_t unselect_all_command_execute(Command_t *command);
static CommandClass_t unselect_all_command_class = {
unselect_all_command_destruct,
unselect_all_command_execute,
- NULL, /* unselect_all_command_undo */
- NULL /* unselect_all_command_redo */
+ NULL, /* unselect_all_command_undo */
+ NULL /* unselect_all_command_redo */
};
typedef struct {
@@ -53,7 +53,7 @@ unselect_all_command_new(ObjectList_t *list, Object_t *exception)
command->list = list;
command->exception = (exception) ? object_ref(exception) : exception;
return command_init(&command->parent, _("Unselect All"),
- &unselect_all_command_class);
+ &unselect_all_command_class);
}
static void
@@ -79,7 +79,7 @@ unselect_all_command_execute(Command_t *parent)
CmdExecuteValue_t rvalue;
id = object_list_add_select_cb(command->list, select_one_object,
- command);
+ command);
if (object_list_deselect_all(command->list, command->exception)) {
rvalue = CMD_APPEND;
} else {
diff --git a/plug-ins/imagemap/imap_command.c b/plug-ins/imagemap/imap_command.c
index be84b87..38c6515 100644
--- a/plug-ins/imagemap/imap_command.c
+++ b/plug-ins/imagemap/imap_command.c
@@ -37,7 +37,7 @@ static CommandList_t *_current_command_list = &_command_list;
static void
command_list_callback_add(CommandListCallback_t *list,
- CommandListCallbackFunc_t func, gpointer data)
+ CommandListCallbackFunc_t func, gpointer data)
{
CommandListCB_t *cb = g_new(CommandListCB_t, 1);
cb->func = func;
@@ -133,10 +133,10 @@ subcommand_list_add(CommandList_t *list, Command_t *command)
}
static CommandClass_t parent_command_class = {
- NULL, /* parent_command_destruct */
- NULL, /* parent_command_execute */
- NULL, /* parent_command_undo */
- NULL /* parent_command_redo */
+ NULL, /* parent_command_destruct */
+ NULL, /* parent_command_execute */
+ NULL, /* parent_command_undo */
+ NULL /* parent_command_redo */
};
static Command_t*
@@ -179,22 +179,22 @@ _command_list_set_undo_level(CommandList_t *list, gint level)
GList *p, *q;
/* first remove data at the front */
for (p = list->list; diff && p != list->undo; p = q, diff--) {
- Command_t *curr = (Command_t*) p->data;
- q = p->next;
- command_destruct(curr);
- list->list = g_list_remove_link(list->list, p);
+ Command_t *curr = (Command_t*) p->data;
+ q = p->next;
+ command_destruct(curr);
+ list->list = g_list_remove_link(list->list, p);
}
/* If still to long start removing redo levels at the end */
for (p = g_list_last(list->list); diff && p != list->undo; p = q,
- diff--) {
- Command_t *curr = (Command_t*) p->data;
- q = p->prev;
- command_destruct(curr);
- list->list = g_list_remove_link(list->list, p);
+ diff--) {
+ Command_t *curr = (Command_t*) p->data;
+ q = p->prev;
+ command_destruct(curr);
+ list->list = g_list_remove_link(list->list, p);
}
command_list_callback_call(&list->update_cb,
- (Command_t*) list->undo->data);
+ (Command_t*) list->undo->data);
}
list->undo_levels = level;
}
@@ -233,9 +233,9 @@ command_list_execute(CommandList_t *list)
for (p = list->list; p; p = p->next) {
Command_t *command = (Command_t*) p->data;
if (command->sub_commands)
- command_list_execute(command->sub_commands);
+ command_list_execute(command->sub_commands);
if (command->class->execute)
- (void) command->class->execute(command);
+ (void) command->class->execute(command);
}
}
@@ -246,13 +246,13 @@ command_execute(Command_t *command)
command->locked = FALSE;
} else {
if (command->sub_commands)
- command_list_execute(command->sub_commands);
+ command_list_execute(command->sub_commands);
if (command->class->execute) {
- CmdExecuteValue_t value = command->class->execute(command);
- if (value == CMD_APPEND)
- command_list_add(command);
- else if (value == CMD_DESTRUCT)
- command_destruct(command);
+ CmdExecuteValue_t value = command->class->execute(command);
+ if (value == CMD_APPEND)
+ command_list_add(command);
+ else if (value == CMD_DESTRUCT)
+ command_destruct(command);
}
}
}
@@ -357,10 +357,10 @@ command_add_subcommand(Command_t *command, Command_t *sub_command)
static CmdExecuteValue_t basic_command_execute(Command_t *command);
static CommandClass_t basic_command_class = {
- NULL, /* basic_command_destruct */
+ NULL, /* basic_command_destruct */
basic_command_execute,
NULL,
- NULL /* basic_command_redo */
+ NULL /* basic_command_redo */
};
typedef struct {
diff --git a/plug-ins/imagemap/imap_command.h b/plug-ins/imagemap/imap_command.h
index 7397dee..47fc894 100644
--- a/plug-ins/imagemap/imap_command.h
+++ b/plug-ins/imagemap/imap_command.h
@@ -43,8 +43,8 @@ struct CommandClass_t {
struct Command_t {
CommandClass_t *class;
CommandList_t *sub_commands;
- const gchar *name;
- gboolean locked;
+ const gchar *name;
+ gboolean locked;
};
@@ -65,8 +65,8 @@ struct CommandList_t {
CommandList_t *parent;
gint undo_levels;
GList *list;
- GList *undo; /* Pointer to current undo command */
- GList *redo; /* Pointer to current redo command */
+ GList *undo; /* Pointer to current undo command */
+ GList *redo; /* Pointer to current redo command */
CommandListCallback_t update_cb;
};
@@ -84,7 +84,7 @@ Command_t *command_list_get_redo_command(void);
Command_t *command_new(void (*func)(void));
Command_t *command_init(Command_t *command, const gchar *name,
- CommandClass_t *class);
+ CommandClass_t *class);
void command_execute(Command_t *command);
void command_undo(Command_t *command);
void command_redo(Command_t *command);
diff --git a/plug-ins/imagemap/imap_commands.h b/plug-ins/imagemap/imap_commands.h
index 68044c2..c5132b2 100644
--- a/plug-ins/imagemap/imap_commands.h
+++ b/plug-ins/imagemap/imap_commands.h
@@ -37,13 +37,13 @@ Command_t *delete_command_new(ObjectList_t *list, Object_t *obj);
Command_t *delete_point_command_new(Object_t *obj, GdkPoint *point);
Command_t *edit_object_command_new(Object_t *obj);
Command_t *gimp_guides_command_new(ObjectList_t *list,
- GimpDrawable *_drawable);
+ GimpDrawable *_drawable);
Command_t *guides_command_new(ObjectList_t *list);
Command_t *insert_point_command_new(Object_t *obj, gint x, gint y, gint edge);
Command_t *move_down_command_new(ObjectList_t *list);
Command_t *move_command_new(Preview_t *preview, Object_t *obj, gint x, gint y);
Command_t *move_sash_command_new(GtkWidget *widget, Object_t *obj,
- gint x, gint y, MoveSashFunc_t sash_func);
+ gint x, gint y, MoveSashFunc_t sash_func);
Command_t *move_selected_command_new(ObjectList_t *list, gint dx, gint dy);
Command_t *move_to_front_command_new(ObjectList_t *list);
Command_t *move_up_command_new(ObjectList_t *list);
@@ -56,7 +56,7 @@ Command_t *select_command_new(Object_t *obj);
Command_t *select_next_command_new(ObjectList_t *list);
Command_t *select_prev_command_new(ObjectList_t *list);
Command_t *select_region_command_new(GtkWidget *widget, ObjectList_t *list,
- gint x, gint y);
+ gint x, gint y);
Command_t *send_to_back_command_new(ObjectList_t *list);
Command_t *unselect_all_command_new(ObjectList_t *list, Object_t *exception);
Command_t *unselect_command_new(Object_t *obj);
diff --git a/plug-ins/imagemap/imap_csim_lex.c b/plug-ins/imagemap/imap_csim_lex.c
index fdc2b3e..102e290 100644
--- a/plug-ins/imagemap/imap_csim_lex.c
+++ b/plug-ins/imagemap/imap_csim_lex.c
@@ -111,15 +111,15 @@ typedef unsigned int flex_uint32_t;
/* The "const" storage-class-modifier is valid. */
#define YY_USE_CONST
-#else /* ! __cplusplus */
+#else /* ! __cplusplus */
/* C99 requires __STDC__ to be defined as 1. */
#if defined (__STDC__)
#define YY_USE_CONST
-#endif /* defined (__STDC__) */
-#endif /* ! __cplusplus */
+#endif /* defined (__STDC__) */
+#endif /* ! __cplusplus */
#ifdef YY_USE_CONST
#define yyconst const
@@ -192,17 +192,17 @@ extern FILE *csim_in, *csim_out;
/* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \
- do \
- { \
- /* Undo effects of setting up csim_text. */ \
+ do \
+ { \
+ /* Undo effects of setting up csim_text. */ \
int yyless_macro_arg = (n); \
YY_LESS_LINENO(yyless_macro_arg);\
- *yy_cp = (yy_hold_char); \
- YY_RESTORE_YY_MORE_OFFSET \
- (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
- YY_DO_BEFORE_ACTION; /* set up csim_text again */ \
- } \
- while ( 0 )
+ *yy_cp = (yy_hold_char); \
+ YY_RESTORE_YY_MORE_OFFSET \
+ (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+ YY_DO_BEFORE_ACTION; /* set up csim_text again */ \
+ } \
+ while ( 0 )
#define unput(c) yyunput( c, (yytext_ptr) )
@@ -214,66 +214,66 @@ typedef size_t yy_size_t;
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
- {
- FILE *yy_input_file;
-
- char *yy_ch_buf; /* input buffer */
- char *yy_buf_pos; /* current position in input buffer */
-
- /* Size of input buffer in bytes, not including room for EOB
- * characters.
- */
- yy_size_t yy_buf_size;
-
- /* Number of characters read into yy_ch_buf, not including EOB
- * characters.
- */
- int yy_n_chars;
-
- /* Whether we "own" the buffer - i.e., we know we created it,
- * and can realloc() it to grow it, and should free() it to
- * delete it.
- */
- int yy_is_our_buffer;
-
- /* Whether this is an "interactive" input source; if so, and
- * if we're using stdio for input, then we want to use getc()
- * instead of fread(), to make sure we stop fetching input after
- * each newline.
- */
- int yy_is_interactive;
-
- /* Whether we're considered to be at the beginning of a line.
- * If so, '^' rules will be active on the next match, otherwise
- * not.
- */
- int yy_at_bol;
+ {
+ FILE *yy_input_file;
+
+ char *yy_ch_buf; /* input buffer */
+ char *yy_buf_pos; /* current position in input buffer */
+
+ /* Size of input buffer in bytes, not including room for EOB
+ * characters.
+ */
+ yy_size_t yy_buf_size;
+
+ /* Number of characters read into yy_ch_buf, not including EOB
+ * characters.
+ */
+ int yy_n_chars;
+
+ /* Whether we "own" the buffer - i.e., we know we created it,
+ * and can realloc() it to grow it, and should free() it to
+ * delete it.
+ */
+ int yy_is_our_buffer;
+
+ /* Whether this is an "interactive" input source; if so, and
+ * if we're using stdio for input, then we want to use getc()
+ * instead of fread(), to make sure we stop fetching input after
+ * each newline.
+ */
+ int yy_is_interactive;
+
+ /* Whether we're considered to be at the beginning of a line.
+ * If so, '^' rules will be active on the next match, otherwise
+ * not.
+ */
+ int yy_at_bol;
int yy_bs_lineno; /**< The line count. */
int yy_bs_column; /**< The column count. */
- /* Whether to try to fill the input buffer when we reach the
- * end of it.
- */
- int yy_fill_buffer;
+ /* Whether to try to fill the input buffer when we reach the
+ * end of it.
+ */
+ int yy_fill_buffer;
- int yy_buffer_status;
+ int yy_buffer_status;
#define YY_BUFFER_NEW 0
#define YY_BUFFER_NORMAL 1
- /* When an EOF's been seen but there's still some text to process
- * then we mark the buffer as YY_EOF_PENDING, to indicate that we
- * shouldn't try reading from the input source any more. We might
- * still have a bunch of tokens to match, though, because of
- * possible backing-up.
- *
- * When we actually see the EOF, we change the status to "new"
- * (via csim_restart()), so that the user can continue scanning by
- * just pointing csim_in at a new input file.
- */
+ /* When an EOF's been seen but there's still some text to process
+ * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+ * shouldn't try reading from the input source any more. We might
+ * still have a bunch of tokens to match, though, because of
+ * possible backing-up.
+ *
+ * When we actually see the EOF, we change the status to "new"
+ * (via csim_restart()), so that the user can continue scanning by
+ * just pointing csim_in at a new input file.
+ */
#define YY_BUFFER_EOF_PENDING 2
- };
+ };
#endif /* !YY_STRUCT_YY_BUFFER_STATE */
/* Stack of input buffers. */
@@ -298,13 +298,13 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
/* yy_hold_char holds the character lost when csim_text is formed. */
static char yy_hold_char;
-static int yy_n_chars; /* number of characters read into yy_ch_buf */
+static int yy_n_chars; /* number of characters read into yy_ch_buf */
int csim_leng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 0; /* whether we need to initialize */
-static int yy_start = 0; /* start state number */
+static int yy_init = 0; /* whether we need to initialize */
+static int yy_start = 0; /* start state number */
/* Flag which is used to allow csim_wrap()'s to do buffer switches
* instead of setting up a fresh csim_in. A bit of a hack ...
@@ -336,24 +336,24 @@ void csim_free (void * );
#define yy_new_buffer csim__create_buffer
#define yy_set_interactive(is_interactive) \
- { \
- if ( ! YY_CURRENT_BUFFER ){ \
+ { \
+ if ( ! YY_CURRENT_BUFFER ){ \
csim_ensure_buffer_stack (); \
- YY_CURRENT_BUFFER_LVALUE = \
+ YY_CURRENT_BUFFER_LVALUE = \
csim__create_buffer(csim_in,YY_BUF_SIZE ); \
- } \
- YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
- }
+ } \
+ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+ }
#define yy_set_bol(at_bol) \
- { \
- if ( ! YY_CURRENT_BUFFER ){\
+ { \
+ if ( ! YY_CURRENT_BUFFER ){\
csim_ensure_buffer_stack (); \
- YY_CURRENT_BUFFER_LVALUE = \
+ YY_CURRENT_BUFFER_LVALUE = \
csim__create_buffer(csim_in,YY_BUF_SIZE ); \
- } \
- YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
- }
+ } \
+ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+ }
#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
@@ -384,21 +384,21 @@ static void yy_fatal_error (yyconst char msg[] );
* corresponding action - sets up csim_text.
*/
#define YY_DO_BEFORE_ACTION \
- (yytext_ptr) = yy_bp; \
- csim_leng = (size_t) (yy_cp - yy_bp); \
- (yy_hold_char) = *yy_cp; \
- *yy_cp = '\0'; \
- (yy_c_buf_p) = yy_cp;
+ (yytext_ptr) = yy_bp; \
+ csim_leng = (size_t) (yy_cp - yy_bp); \
+ (yy_hold_char) = *yy_cp; \
+ *yy_cp = '\0'; \
+ (yy_c_buf_p) = yy_cp;
#define YY_NUM_RULES 32
#define YY_END_OF_BUFFER 33
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
- {
- flex_int32_t yy_verify;
- flex_int32_t yy_nxt;
- };
+ {
+ flex_int32_t yy_verify;
+ flex_int32_t yy_nxt;
+ };
static yyconst flex_int16_t yy_accept[154] =
{ 0,
29, 29, 28, 28, 0, 0, 33, 31, 30, 30,
@@ -748,33 +748,33 @@ static int input (void );
*/
#ifndef YY_INPUT
#define YY_INPUT(buf,result,max_size) \
- if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
- { \
- int c = '*'; \
- size_t n; \
- for ( n = 0; n < max_size && \
- (c = getc( csim_in )) != EOF && c != '\n'; ++n ) \
- buf[n] = (char) c; \
- if ( c == '\n' ) \
- buf[n++] = (char) c; \
- if ( c == EOF && ferror( csim_in ) ) \
- YY_FATAL_ERROR( "input in flex scanner failed" ); \
- result = n; \
- } \
- else \
- { \
- errno=0; \
- while ( (result = fread(buf, 1, max_size, csim_in))==0 && ferror(csim_in)) \
- { \
- if( errno != EINTR) \
- { \
- YY_FATAL_ERROR( "input in flex scanner failed" ); \
- break; \
- } \
- errno=0; \
- clearerr(csim_in); \
- } \
- }\
+ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+ { \
+ int c = '*'; \
+ size_t n; \
+ for ( n = 0; n < max_size && \
+ (c = getc( csim_in )) != EOF && c != '\n'; ++n ) \
+ buf[n] = (char) c; \
+ if ( c == '\n' ) \
+ buf[n++] = (char) c; \
+ if ( c == EOF && ferror( csim_in ) ) \
+ YY_FATAL_ERROR( "input in flex scanner failed" ); \
+ result = n; \
+ } \
+ else \
+ { \
+ errno=0; \
+ while ( (result = fread(buf, 1, max_size, csim_in))==0 && ferror(csim_in)) \
+ { \
+ if( errno != EINTR) \
+ { \
+ YY_FATAL_ERROR( "input in flex scanner failed" ); \
+ break; \
+ } \
+ errno=0; \
+ clearerr(csim_in); \
+ } \
+ }\
\
#endif
@@ -823,134 +823,134 @@ extern int csim_lex (void);
#endif
#define YY_RULE_SETUP \
- YY_USER_ACTION
+ YY_USER_ACTION
/** The main scanner function which does all the work.
*/
YY_DECL
{
- register yy_state_type yy_current_state;
- register char *yy_cp, *yy_bp;
- register int yy_act;
+ register yy_state_type yy_current_state;
+ register char *yy_cp, *yy_bp;
+ register int yy_act;
#line 45 "imap_csim.l"
#line 840 "<stdout>"
- if ( !(yy_init) )
- {
- (yy_init) = 1;
+ if ( !(yy_init) )
+ {
+ (yy_init) = 1;
#ifdef YY_USER_INIT
- YY_USER_INIT;
+ YY_USER_INIT;
#endif
- if ( ! (yy_start) )
- (yy_start) = 1; /* first start state */
+ if ( ! (yy_start) )
+ (yy_start) = 1; /* first start state */
- if ( ! csim_in )
- csim_in = stdin;
+ if ( ! csim_in )
+ csim_in = stdin;
- if ( ! csim_out )
- csim_out = stdout;
+ if ( ! csim_out )
+ csim_out = stdout;
- if ( ! YY_CURRENT_BUFFER ) {
- csim_ensure_buffer_stack ();
- YY_CURRENT_BUFFER_LVALUE =
- csim__create_buffer(csim_in,YY_BUF_SIZE );
- }
+ if ( ! YY_CURRENT_BUFFER ) {
+ csim_ensure_buffer_stack ();
+ YY_CURRENT_BUFFER_LVALUE =
+ csim__create_buffer(csim_in,YY_BUF_SIZE );
+ }
- csim__load_buffer_state( );
- }
+ csim__load_buffer_state( );
+ }
- while ( 1 ) /* loops until end-of-file is reached */
- {
- yy_cp = (yy_c_buf_p);
+ while ( 1 ) /* loops until end-of-file is reached */
+ {
+ yy_cp = (yy_c_buf_p);
- /* Support of csim_text. */
- *yy_cp = (yy_hold_char);
+ /* Support of csim_text. */
+ *yy_cp = (yy_hold_char);
- /* yy_bp points to the position in yy_ch_buf of the start of
- * the current run.
- */
- yy_bp = yy_cp;
+ /* yy_bp points to the position in yy_ch_buf of the start of
+ * the current run.
+ */
+ yy_bp = yy_cp;
- yy_current_state = (yy_start);
+ yy_current_state = (yy_start);
yy_match:
- do
- {
- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
- if ( yy_accept[yy_current_state] )
- {
- (yy_last_accepting_state) = yy_current_state;
- (yy_last_accepting_cpos) = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 154 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- ++yy_cp;
- }
- while ( yy_base[yy_current_state] != 322 );
+ do
+ {
+ register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+ if ( yy_accept[yy_current_state] )
+ {
+ (yy_last_accepting_state) = yy_current_state;
+ (yy_last_accepting_cpos) = yy_cp;
+ }
+ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ {
+ yy_current_state = (int) yy_def[yy_current_state];
+ if ( yy_current_state >= 154 )
+ yy_c = yy_meta[(unsigned int) yy_c];
+ }
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ ++yy_cp;
+ }
+ while ( yy_base[yy_current_state] != 322 );
yy_find_action:
- yy_act = yy_accept[yy_current_state];
- if ( yy_act == 0 )
- { /* have to back up */
- yy_cp = (yy_last_accepting_cpos);
- yy_current_state = (yy_last_accepting_state);
- yy_act = yy_accept[yy_current_state];
- }
-
- YY_DO_BEFORE_ACTION;
-
-do_action: /* This label is used only to access EOF actions. */
-
- switch ( yy_act )
- { /* beginning of action switch */
- case 0: /* must back up */
- /* undo the effects of YY_DO_BEFORE_ACTION */
- *yy_cp = (yy_hold_char);
- yy_cp = (yy_last_accepting_cpos);
- yy_current_state = (yy_last_accepting_state);
- goto yy_find_action;
+ yy_act = yy_accept[yy_current_state];
+ if ( yy_act == 0 )
+ { /* have to back up */
+ yy_cp = (yy_last_accepting_cpos);
+ yy_current_state = (yy_last_accepting_state);
+ yy_act = yy_accept[yy_current_state];
+ }
+
+ YY_DO_BEFORE_ACTION;
+
+do_action: /* This label is used only to access EOF actions. */
+
+ switch ( yy_act )
+ { /* beginning of action switch */
+ case 0: /* must back up */
+ /* undo the effects of YY_DO_BEFORE_ACTION */
+ *yy_cp = (yy_hold_char);
+ yy_cp = (yy_last_accepting_cpos);
+ yy_current_state = (yy_last_accepting_state);
+ goto yy_find_action;
case 1:
YY_RULE_SETUP
#line 47 "imap_csim.l"
{
- BEGIN(comment);
- return AUTHOR;
- }
- YY_BREAK
+ BEGIN(comment);
+ return AUTHOR;
+ }
+ YY_BREAK
case 2:
YY_RULE_SETUP
#line 52 "imap_csim.l"
{
- BEGIN(comment);
- return DESCRIPTION;
- }
- YY_BREAK
+ BEGIN(comment);
+ return DESCRIPTION;
+ }
+ YY_BREAK
case 3:
YY_RULE_SETUP
#line 57 "imap_csim.l"
{
- BEGIN(comment);
- return BEGIN_COMMENT;
- }
- YY_BREAK
+ BEGIN(comment);
+ return BEGIN_COMMENT;
+ }
+ YY_BREAK
case 4:
YY_RULE_SETUP
#line 62 "imap_csim.l"
{
- BEGIN(INITIAL);
- return END_COMMENT;
- }
- YY_BREAK
+ BEGIN(INITIAL);
+ return END_COMMENT;
+ }
+ YY_BREAK
case 5:
*yy_cp = (yy_hold_char); /* undo effects of setting up csim_text */
(yy_c_buf_p) = yy_cp -= 3;
@@ -958,523 +958,523 @@ YY_DO_BEFORE_ACTION; /* set up csim_text again */
YY_RULE_SETUP
#line 67 "imap_csim.l"
{
- csim_lval.id = g_strndup (csim_text, csim_leng);
- return STRING;
- }
- YY_BREAK
+ csim_lval.id = g_strndup (csim_text, csim_leng);
+ return STRING;
+ }
+ YY_BREAK
case 6:
YY_RULE_SETUP
#line 72 "imap_csim.l"
return IMG;
- YY_BREAK
+ YY_BREAK
case 7:
YY_RULE_SETUP
#line 74 "imap_csim.l"
return SRC;
- YY_BREAK
+ YY_BREAK
case 8:
YY_RULE_SETUP
#line 76 "imap_csim.l"
return WIDTH;
- YY_BREAK
+ YY_BREAK
case 9:
YY_RULE_SETUP
#line 78 "imap_csim.l"
return HEIGHT;
- YY_BREAK
+ YY_BREAK
case 10:
YY_RULE_SETUP
#line 80 "imap_csim.l"
return BORDER;
- YY_BREAK
+ YY_BREAK
case 11:
YY_RULE_SETUP
#line 82 "imap_csim.l"
return USEMAP;
- YY_BREAK
+ YY_BREAK
case 12:
YY_RULE_SETUP
#line 84 "imap_csim.l"
return START_MAP;
- YY_BREAK
+ YY_BREAK
case 13:
YY_RULE_SETUP
#line 86 "imap_csim.l"
return END_MAP;
- YY_BREAK
+ YY_BREAK
case 14:
YY_RULE_SETUP
#line 88 "imap_csim.l"
return NAME;
- YY_BREAK
+ YY_BREAK
case 15:
YY_RULE_SETUP
#line 90 "imap_csim.l"
return AREA;
- YY_BREAK
+ YY_BREAK
case 16:
YY_RULE_SETUP
#line 92 "imap_csim.l"
return SHAPE;
- YY_BREAK
+ YY_BREAK
case 17:
YY_RULE_SETUP
#line 94 "imap_csim.l"
return COORDS;
- YY_BREAK
+ YY_BREAK
case 18:
YY_RULE_SETUP
#line 96 "imap_csim.l"
return TARGET;
- YY_BREAK
+ YY_BREAK
case 19:
YY_RULE_SETUP
#line 98 "imap_csim.l"
return ONMOUSEOVER;
- YY_BREAK
+ YY_BREAK
case 20:
YY_RULE_SETUP
#line 100 "imap_csim.l"
return ONMOUSEOUT;
- YY_BREAK
+ YY_BREAK
case 21:
YY_RULE_SETUP
#line 102 "imap_csim.l"
return ONFOCUS;
- YY_BREAK
+ YY_BREAK
case 22:
YY_RULE_SETUP
#line 104 "imap_csim.l"
return ONBLUR;
- YY_BREAK
+ YY_BREAK
case 23:
YY_RULE_SETUP
#line 106 "imap_csim.l"
return ALT;
- YY_BREAK
+ YY_BREAK
case 24:
YY_RULE_SETUP
#line 108 "imap_csim.l"
return HREF;
- YY_BREAK
+ YY_BREAK
case 25:
YY_RULE_SETUP
#line 110 "imap_csim.l"
return NOHREF;
- YY_BREAK
+ YY_BREAK
case 26:
YY_RULE_SETUP
#line 112 "imap_csim.l"
{
- BEGIN(quoted_string);
- }
- YY_BREAK
+ BEGIN(quoted_string);
+ }
+ YY_BREAK
case 27:
YY_RULE_SETUP
#line 116 "imap_csim.l"
{
- BEGIN(INITIAL);
- return STRING;
- }
- YY_BREAK
+ BEGIN(INITIAL);
+ return STRING;
+ }
+ YY_BREAK
case 28:
/* rule 28 can match eol */
YY_RULE_SETUP
#line 121 "imap_csim.l"
{
- csim_lval.id = g_strndup (csim_text, csim_leng);
- }
- YY_BREAK
+ csim_lval.id = g_strndup (csim_text, csim_leng);
+ }
+ YY_BREAK
case 29:
YY_RULE_SETUP
#line 125 "imap_csim.l"
{
csim_lval.value = g_ascii_strtod (csim_text, NULL);
- return FLOAT;
- }
- YY_BREAK
+ return FLOAT;
+ }
+ YY_BREAK
case 30:
/* rule 30 can match eol */
YY_RULE_SETUP
#line 130 "imap_csim.l"
; /* Eat white space */
- YY_BREAK
+ YY_BREAK
case 31:
YY_RULE_SETUP
#line 132 "imap_csim.l"
return *csim_text;
- YY_BREAK
+ YY_BREAK
case 32:
YY_RULE_SETUP
#line 134 "imap_csim.l"
ECHO;
- YY_BREAK
+ YY_BREAK
#line 1113 "<stdout>"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(quoted_string):
case YY_STATE_EOF(comment):
- yyterminate();
-
- case YY_END_OF_BUFFER:
- {
- /* Amount of text matched not including the EOB char. */
- int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
-
- /* Undo the effects of YY_DO_BEFORE_ACTION. */
- *yy_cp = (yy_hold_char);
- YY_RESTORE_YY_MORE_OFFSET
-
- if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
- {
- /* We're scanning a new file or input source. It's
- * possible that this happened because the user
- * just pointed csim_in at a new source and called
- * csim_lex(). If so, then we have to assure
- * consistency between YY_CURRENT_BUFFER and our
- * globals. Here is the right place to do so, because
- * this is the first action (other than possibly a
- * back-up) that will match for the new input source.
- */
- (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
- YY_CURRENT_BUFFER_LVALUE->yy_input_file = csim_in;
- YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
- }
-
- /* Note that here we test for yy_c_buf_p "<=" to the position
- * of the first EOB in the buffer, since yy_c_buf_p will
- * already have been incremented past the NUL character
- * (since all states make transitions on EOB to the
- * end-of-buffer state). Contrast this with the test
- * in input().
- */
- if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
- { /* This was really a NUL. */
- yy_state_type yy_next_state;
-
- (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
-
- yy_current_state = yy_get_previous_state( );
-
- /* Okay, we're now positioned to make the NUL
- * transition. We couldn't have
- * yy_get_previous_state() go ahead and do it
- * for us because it doesn't know how to deal
- * with the possibility of jamming (and we don't
- * want to build jamming into it because then it
- * will run more slowly).
- */
-
- yy_next_state = yy_try_NUL_trans( yy_current_state );
-
- yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-
- if ( yy_next_state )
- {
- /* Consume the NUL. */
- yy_cp = ++(yy_c_buf_p);
- yy_current_state = yy_next_state;
- goto yy_match;
- }
-
- else
- {
- yy_cp = (yy_c_buf_p);
- goto yy_find_action;
- }
- }
-
- else switch ( yy_get_next_buffer( ) )
- {
- case EOB_ACT_END_OF_FILE:
- {
- (yy_did_buffer_switch_on_eof) = 0;
-
- if ( csim_wrap( ) )
- {
- /* Note: because we've taken care in
- * yy_get_next_buffer() to have set up
- * csim_text, we can now set up
- * yy_c_buf_p so that if some total
- * hoser (like flex itself) wants to
- * call the scanner after we return the
- * YY_NULL, it'll still work - another
- * YY_NULL will get returned.
- */
- (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
-
- yy_act = YY_STATE_EOF(YY_START);
- goto do_action;
- }
-
- else
- {
- if ( ! (yy_did_buffer_switch_on_eof) )
- YY_NEW_FILE;
- }
- break;
- }
-
- case EOB_ACT_CONTINUE_SCAN:
- (yy_c_buf_p) =
- (yytext_ptr) + yy_amount_of_matched_text;
-
- yy_current_state = yy_get_previous_state( );
-
- yy_cp = (yy_c_buf_p);
- yy_bp = (yytext_ptr) + YY_MORE_ADJ;
- goto yy_match;
-
- case EOB_ACT_LAST_MATCH:
- (yy_c_buf_p) =
- &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
-
- yy_current_state = yy_get_previous_state( );
-
- yy_cp = (yy_c_buf_p);
- yy_bp = (yytext_ptr) + YY_MORE_ADJ;
- goto yy_find_action;
- }
- break;
- }
-
- default:
- YY_FATAL_ERROR(
- "fatal flex scanner internal error--no action found" );
- } /* end of action switch */
- } /* end of scanning one token */
+ yyterminate();
+
+ case YY_END_OF_BUFFER:
+ {
+ /* Amount of text matched not including the EOB char. */
+ int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+ /* Undo the effects of YY_DO_BEFORE_ACTION. */
+ *yy_cp = (yy_hold_char);
+ YY_RESTORE_YY_MORE_OFFSET
+
+ if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+ {
+ /* We're scanning a new file or input source. It's
+ * possible that this happened because the user
+ * just pointed csim_in at a new source and called
+ * csim_lex(). If so, then we have to assure
+ * consistency between YY_CURRENT_BUFFER and our
+ * globals. Here is the right place to do so, because
+ * this is the first action (other than possibly a
+ * back-up) that will match for the new input source.
+ */
+ (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+ YY_CURRENT_BUFFER_LVALUE->yy_input_file = csim_in;
+ YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+ }
+
+ /* Note that here we test for yy_c_buf_p "<=" to the position
+ * of the first EOB in the buffer, since yy_c_buf_p will
+ * already have been incremented past the NUL character
+ * (since all states make transitions on EOB to the
+ * end-of-buffer state). Contrast this with the test
+ * in input().
+ */
+ if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+ { /* This was really a NUL. */
+ yy_state_type yy_next_state;
+
+ (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+ yy_current_state = yy_get_previous_state( );
+
+ /* Okay, we're now positioned to make the NUL
+ * transition. We couldn't have
+ * yy_get_previous_state() go ahead and do it
+ * for us because it doesn't know how to deal
+ * with the possibility of jamming (and we don't
+ * want to build jamming into it because then it
+ * will run more slowly).
+ */
+
+ yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+ yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+ if ( yy_next_state )
+ {
+ /* Consume the NUL. */
+ yy_cp = ++(yy_c_buf_p);
+ yy_current_state = yy_next_state;
+ goto yy_match;
+ }
+
+ else
+ {
+ yy_cp = (yy_c_buf_p);
+ goto yy_find_action;
+ }
+ }
+
+ else switch ( yy_get_next_buffer( ) )
+ {
+ case EOB_ACT_END_OF_FILE:
+ {
+ (yy_did_buffer_switch_on_eof) = 0;
+
+ if ( csim_wrap( ) )
+ {
+ /* Note: because we've taken care in
+ * yy_get_next_buffer() to have set up
+ * csim_text, we can now set up
+ * yy_c_buf_p so that if some total
+ * hoser (like flex itself) wants to
+ * call the scanner after we return the
+ * YY_NULL, it'll still work - another
+ * YY_NULL will get returned.
+ */
+ (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+ yy_act = YY_STATE_EOF(YY_START);
+ goto do_action;
+ }
+
+ else
+ {
+ if ( ! (yy_did_buffer_switch_on_eof) )
+ YY_NEW_FILE;
+ }
+ break;
+ }
+
+ case EOB_ACT_CONTINUE_SCAN:
+ (yy_c_buf_p) =
+ (yytext_ptr) + yy_amount_of_matched_text;
+
+ yy_current_state = yy_get_previous_state( );
+
+ yy_cp = (yy_c_buf_p);
+ yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+ goto yy_match;
+
+ case EOB_ACT_LAST_MATCH:
+ (yy_c_buf_p) =
+ &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+ yy_current_state = yy_get_previous_state( );
+
+ yy_cp = (yy_c_buf_p);
+ yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+ goto yy_find_action;
+ }
+ break;
+ }
+
+ default:
+ YY_FATAL_ERROR(
+ "fatal flex scanner internal error--no action found" );
+ } /* end of action switch */
+ } /* end of scanning one token */
} /* end of csim_lex */
/* yy_get_next_buffer - try to read in a new buffer
*
* Returns a code representing an action:
- * EOB_ACT_LAST_MATCH -
- * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- * EOB_ACT_END_OF_FILE - end of file
+ * EOB_ACT_LAST_MATCH -
+ * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ * EOB_ACT_END_OF_FILE - end of file
*/
static int yy_get_next_buffer (void)
{
- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
- register char *source = (yytext_ptr);
- register int number_to_move, i;
- int ret_val;
-
- if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
- YY_FATAL_ERROR(
- "fatal flex scanner internal error--end of buffer missed" );
-
- if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
- { /* Don't try to fill the buffer, so this is an EOF. */
- if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
- {
- /* We matched a single character, the EOB, so
- * treat this as a final EOF.
- */
- return EOB_ACT_END_OF_FILE;
- }
-
- else
- {
- /* We matched some text prior to the EOB, first
- * process it.
- */
- return EOB_ACT_LAST_MATCH;
- }
- }
-
- /* Try to read more data. */
-
- /* First move last chars to start of buffer. */
- number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
-
- for ( i = 0; i < number_to_move; ++i )
- *(dest++) = *(source++);
-
- if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
- /* don't do the read, it's not guaranteed to return an EOF,
- * just force an EOF
- */
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
-
- else
- {
- int num_to_read =
- YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-
- while ( num_to_read <= 0 )
- { /* Not enough room in the buffer - grow it. */
-
- /* just a shorter name for the current buffer */
- YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
-
- int yy_c_buf_p_offset =
- (int) ((yy_c_buf_p) - b->yy_ch_buf);
-
- if ( b->yy_is_our_buffer )
- {
- int new_size = b->yy_buf_size * 2;
-
- if ( new_size <= 0 )
- b->yy_buf_size += b->yy_buf_size / 8;
- else
- b->yy_buf_size *= 2;
-
- b->yy_ch_buf = (char *)
- /* Include room in for 2 EOB chars. */
- csim_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 );
- }
- else
- /* Can't grow it, we don't own it. */
- b->yy_ch_buf = 0;
-
- if ( ! b->yy_ch_buf )
- YY_FATAL_ERROR(
- "fatal error - scanner input buffer overflow" );
-
- (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
-
- num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
- number_to_move - 1;
-
- }
-
- if ( num_to_read > YY_READ_BUF_SIZE )
- num_to_read = YY_READ_BUF_SIZE;
-
- /* Read in more data. */
- YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- (yy_n_chars), (size_t) num_to_read );
-
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
- }
-
- if ( (yy_n_chars) == 0 )
- {
- if ( number_to_move == YY_MORE_ADJ )
- {
- ret_val = EOB_ACT_END_OF_FILE;
- csim_restart(csim_in );
- }
-
- else
- {
- ret_val = EOB_ACT_LAST_MATCH;
- YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
- YY_BUFFER_EOF_PENDING;
- }
- }
-
- else
- ret_val = EOB_ACT_CONTINUE_SCAN;
-
- if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
- /* Extend the array by 50%, plus the number we really need. */
- yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) csim_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size );
- if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
- YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
- }
-
- (yy_n_chars) += number_to_move;
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
-
- (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+ register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+ register char *source = (yytext_ptr);
+ register int number_to_move, i;
+ int ret_val;
+
+ if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+ YY_FATAL_ERROR(
+ "fatal flex scanner internal error--end of buffer missed" );
+
+ if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+ { /* Don't try to fill the buffer, so this is an EOF. */
+ if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+ {
+ /* We matched a single character, the EOB, so
+ * treat this as a final EOF.
+ */
+ return EOB_ACT_END_OF_FILE;
+ }
+
+ else
+ {
+ /* We matched some text prior to the EOB, first
+ * process it.
+ */
+ return EOB_ACT_LAST_MATCH;
+ }
+ }
+
+ /* Try to read more data. */
+
+ /* First move last chars to start of buffer. */
+ number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+ for ( i = 0; i < number_to_move; ++i )
+ *(dest++) = *(source++);
+
+ if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+ /* don't do the read, it's not guaranteed to return an EOF,
+ * just force an EOF
+ */
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+ else
+ {
+ int num_to_read =
+ YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+ while ( num_to_read <= 0 )
+ { /* Not enough room in the buffer - grow it. */
+
+ /* just a shorter name for the current buffer */
+ YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+ int yy_c_buf_p_offset =
+ (int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+ if ( b->yy_is_our_buffer )
+ {
+ int new_size = b->yy_buf_size * 2;
+
+ if ( new_size <= 0 )
+ b->yy_buf_size += b->yy_buf_size / 8;
+ else
+ b->yy_buf_size *= 2;
+
+ b->yy_ch_buf = (char *)
+ /* Include room in for 2 EOB chars. */
+ csim_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 );
+ }
+ else
+ /* Can't grow it, we don't own it. */
+ b->yy_ch_buf = 0;
+
+ if ( ! b->yy_ch_buf )
+ YY_FATAL_ERROR(
+ "fatal error - scanner input buffer overflow" );
+
+ (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+ num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+ number_to_move - 1;
+
+ }
+
+ if ( num_to_read > YY_READ_BUF_SIZE )
+ num_to_read = YY_READ_BUF_SIZE;
+
+ /* Read in more data. */
+ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+ (yy_n_chars), (size_t) num_to_read );
+
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+ }
+
+ if ( (yy_n_chars) == 0 )
+ {
+ if ( number_to_move == YY_MORE_ADJ )
+ {
+ ret_val = EOB_ACT_END_OF_FILE;
+ csim_restart(csim_in );
+ }
+
+ else
+ {
+ ret_val = EOB_ACT_LAST_MATCH;
+ YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+ YY_BUFFER_EOF_PENDING;
+ }
+ }
+
+ else
+ ret_val = EOB_ACT_CONTINUE_SCAN;
+
+ if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+ /* Extend the array by 50%, plus the number we really need. */
+ yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+ YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) csim_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size );
+ if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+ YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+ }
+
+ (yy_n_chars) += number_to_move;
+ YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+ YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+ (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
- return ret_val;
+ return ret_val;
}
/* yy_get_previous_state - get the state just before the EOB char was reached */
static yy_state_type yy_get_previous_state (void)
{
- register yy_state_type yy_current_state;
- register char *yy_cp;
+ register yy_state_type yy_current_state;
+ register char *yy_cp;
- yy_current_state = (yy_start);
-
- for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
- {
- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
- if ( yy_accept[yy_current_state] )
- {
- (yy_last_accepting_state) = yy_current_state;
- (yy_last_accepting_cpos) = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 154 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- }
-
- return yy_current_state;
+ yy_current_state = (yy_start);
+
+ for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+ {
+ register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ if ( yy_accept[yy_current_state] )
+ {
+ (yy_last_accepting_state) = yy_current_state;
+ (yy_last_accepting_cpos) = yy_cp;
+ }
+ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ {
+ yy_current_state = (int) yy_def[yy_current_state];
+ if ( yy_current_state >= 154 )
+ yy_c = yy_meta[(unsigned int) yy_c];
+ }
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ }
+
+ return yy_current_state;
}
/* yy_try_NUL_trans - try to make a transition on the NUL character
*
* synopsis
- * next_state = yy_try_NUL_trans( current_state );
+ * next_state = yy_try_NUL_trans( current_state );
*/
static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
{
- register int yy_is_jam;
- register char *yy_cp = (yy_c_buf_p);
-
- register YY_CHAR yy_c = 1;
- if ( yy_accept[yy_current_state] )
- {
- (yy_last_accepting_state) = yy_current_state;
- (yy_last_accepting_cpos) = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 154 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- yy_is_jam = (yy_current_state == 153);
-
- return yy_is_jam ? 0 : yy_current_state;
+ register int yy_is_jam;
+ register char *yy_cp = (yy_c_buf_p);
+
+ register YY_CHAR yy_c = 1;
+ if ( yy_accept[yy_current_state] )
+ {
+ (yy_last_accepting_state) = yy_current_state;
+ (yy_last_accepting_cpos) = yy_cp;
+ }
+ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ {
+ yy_current_state = (int) yy_def[yy_current_state];
+ if ( yy_current_state >= 154 )
+ yy_c = yy_meta[(unsigned int) yy_c];
+ }
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ yy_is_jam = (yy_current_state == 153);
+
+ return yy_is_jam ? 0 : yy_current_state;
}
static void yyunput (int c, register char * yy_bp )
{
- register char *yy_cp;
+ register char *yy_cp;
yy_cp = (yy_c_buf_p);
- /* undo effects of setting up csim_text */
- *yy_cp = (yy_hold_char);
+ /* undo effects of setting up csim_text */
+ *yy_cp = (yy_hold_char);
- if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
- { /* need to shift things up to make room */
- /* +2 for EOB chars. */
- register int number_to_move = (yy_n_chars) + 2;
- register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
- YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
- register char *source =
- &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+ if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+ { /* need to shift things up to make room */
+ /* +2 for EOB chars. */
+ register int number_to_move = (yy_n_chars) + 2;
+ register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+ register char *source =
+ &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
- while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
- *--dest = *--source;
+ while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+ *--dest = *--source;
- yy_cp += (int) (dest - source);
- yy_bp += (int) (dest - source);
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
- (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+ yy_cp += (int) (dest - source);
+ yy_bp += (int) (dest - source);
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+ (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
- if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
- YY_FATAL_ERROR( "flex scanner push-back overflow" );
- }
+ if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+ YY_FATAL_ERROR( "flex scanner push-back overflow" );
+ }
- *--yy_cp = (char) c;
+ *--yy_cp = (char) c;
- (yytext_ptr) = yy_bp;
- (yy_hold_char) = *yy_cp;
- (yy_c_buf_p) = yy_cp;
+ (yytext_ptr) = yy_bp;
+ (yy_hold_char) = *yy_cp;
+ (yy_c_buf_p) = yy_cp;
}
#ifndef YY_NO_INPUT
@@ -1485,71 +1485,71 @@ static int yy_get_next_buffer (void)
#endif
{
- int c;
+ int c;
- *(yy_c_buf_p) = (yy_hold_char);
-
- if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
- {
- /* yy_c_buf_p now points to the character we want to return.
- * If this occurs *before* the EOB characters, then it's a
- * valid NUL; if not, then we've hit the end of the buffer.
- */
- if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
- /* This was really a NUL. */
- *(yy_c_buf_p) = '\0';
-
- else
- { /* need more input */
- int offset = (yy_c_buf_p) - (yytext_ptr);
- ++(yy_c_buf_p);
-
- switch ( yy_get_next_buffer( ) )
- {
- case EOB_ACT_LAST_MATCH:
- /* This happens because yy_g_n_b()
- * sees that we've accumulated a
- * token and flags that we need to
- * try matching the token before
- * proceeding. But for input(),
- * there's no matching to consider.
- * So convert the EOB_ACT_LAST_MATCH
- * to EOB_ACT_END_OF_FILE.
- */
-
- /* Reset buffer status. */
- csim_restart(csim_in );
-
- /*FALLTHROUGH*/
-
- case EOB_ACT_END_OF_FILE:
- {
- if ( csim_wrap( ) )
- return EOF;
-
- if ( ! (yy_did_buffer_switch_on_eof) )
- YY_NEW_FILE;
+ *(yy_c_buf_p) = (yy_hold_char);
+
+ if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+ {
+ /* yy_c_buf_p now points to the character we want to return.
+ * If this occurs *before* the EOB characters, then it's a
+ * valid NUL; if not, then we've hit the end of the buffer.
+ */
+ if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+ /* This was really a NUL. */
+ *(yy_c_buf_p) = '\0';
+
+ else
+ { /* need more input */
+ int offset = (yy_c_buf_p) - (yytext_ptr);
+ ++(yy_c_buf_p);
+
+ switch ( yy_get_next_buffer( ) )
+ {
+ case EOB_ACT_LAST_MATCH:
+ /* This happens because yy_g_n_b()
+ * sees that we've accumulated a
+ * token and flags that we need to
+ * try matching the token before
+ * proceeding. But for input(),
+ * there's no matching to consider.
+ * So convert the EOB_ACT_LAST_MATCH
+ * to EOB_ACT_END_OF_FILE.
+ */
+
+ /* Reset buffer status. */
+ csim_restart(csim_in );
+
+ /*FALLTHROUGH*/
+
+ case EOB_ACT_END_OF_FILE:
+ {
+ if ( csim_wrap( ) )
+ return EOF;
+
+ if ( ! (yy_did_buffer_switch_on_eof) )
+ YY_NEW_FILE;
#ifdef __cplusplus
- return yyinput();
+ return yyinput();
#else
- return input();
+ return input();
#endif
- }
+ }
- case EOB_ACT_CONTINUE_SCAN:
- (yy_c_buf_p) = (yytext_ptr) + offset;
- break;
- }
- }
- }
+ case EOB_ACT_CONTINUE_SCAN:
+ (yy_c_buf_p) = (yytext_ptr) + offset;
+ break;
+ }
+ }
+ }
- c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */
- *(yy_c_buf_p) = '\0'; /* preserve csim_text */
- (yy_hold_char) = *++(yy_c_buf_p);
+ c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */
+ *(yy_c_buf_p) = '\0'; /* preserve csim_text */
+ (yy_hold_char) = *++(yy_c_buf_p);
- return c;
+ return c;
}
-#endif /* ifndef YY_NO_INPUT */
+#endif /* ifndef YY_NO_INPUT */
/** Immediately switch to a different input stream.
* @param input_file A readable stream.
@@ -1559,14 +1559,14 @@ static int yy_get_next_buffer (void)
void csim_restart (FILE * input_file )
{
- if ( ! YY_CURRENT_BUFFER ){
+ if ( ! YY_CURRENT_BUFFER ){
csim_ensure_buffer_stack ();
- YY_CURRENT_BUFFER_LVALUE =
+ YY_CURRENT_BUFFER_LVALUE =
csim__create_buffer(csim_in,YY_BUF_SIZE );
- }
+ }
- csim__init_buffer(YY_CURRENT_BUFFER,input_file );
- csim__load_buffer_state( );
+ csim__init_buffer(YY_CURRENT_BUFFER,input_file );
+ csim__load_buffer_state( );
}
/** Switch to a different input buffer.
@@ -1576,40 +1576,40 @@ static int yy_get_next_buffer (void)
void csim__switch_to_buffer (YY_BUFFER_STATE new_buffer )
{
- /* TODO. We should be able to replace this entire function body
- * with
- * csim_pop_buffer_state();
- * csim_push_buffer_state(new_buffer);
+ /* TODO. We should be able to replace this entire function body
+ * with
+ * csim_pop_buffer_state();
+ * csim_push_buffer_state(new_buffer);
*/
- csim_ensure_buffer_stack ();
- if ( YY_CURRENT_BUFFER == new_buffer )
- return;
-
- if ( YY_CURRENT_BUFFER )
- {
- /* Flush out information for old buffer. */
- *(yy_c_buf_p) = (yy_hold_char);
- YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
- }
-
- YY_CURRENT_BUFFER_LVALUE = new_buffer;
- csim__load_buffer_state( );
-
- /* We don't actually know whether we did this switch during
- * EOF (csim_wrap()) processing, but the only time this flag
- * is looked at is after csim_wrap() is called, so it's safe
- * to go ahead and always set it.
- */
- (yy_did_buffer_switch_on_eof) = 1;
+ csim_ensure_buffer_stack ();
+ if ( YY_CURRENT_BUFFER == new_buffer )
+ return;
+
+ if ( YY_CURRENT_BUFFER )
+ {
+ /* Flush out information for old buffer. */
+ *(yy_c_buf_p) = (yy_hold_char);
+ YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+ }
+
+ YY_CURRENT_BUFFER_LVALUE = new_buffer;
+ csim__load_buffer_state( );
+
+ /* We don't actually know whether we did this switch during
+ * EOF (csim_wrap()) processing, but the only time this flag
+ * is looked at is after csim_wrap() is called, so it's safe
+ * to go ahead and always set it.
+ */
+ (yy_did_buffer_switch_on_eof) = 1;
}
static void csim__load_buffer_state (void)
{
- (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
- (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
- csim_in = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
- (yy_hold_char) = *(yy_c_buf_p);
+ (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+ (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+ csim_in = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+ (yy_hold_char) = *(yy_c_buf_p);
}
/** Allocate and initialize an input buffer state.
@@ -1620,26 +1620,26 @@ static void csim__load_buffer_state (void)
*/
YY_BUFFER_STATE csim__create_buffer (FILE * file, int size )
{
- YY_BUFFER_STATE b;
+ YY_BUFFER_STATE b;
- b = (YY_BUFFER_STATE) csim_alloc(sizeof( struct yy_buffer_state ) );
- if ( ! b )
- YY_FATAL_ERROR( "out of dynamic memory in csim__create_buffer()" );
+ b = (YY_BUFFER_STATE) csim_alloc(sizeof( struct yy_buffer_state ) );
+ if ( ! b )
+ YY_FATAL_ERROR( "out of dynamic memory in csim__create_buffer()" );
- b->yy_buf_size = size;
+ b->yy_buf_size = size;
- /* yy_ch_buf has to be 2 characters longer than the size given because
- * we need to put in 2 end-of-buffer characters.
- */
- b->yy_ch_buf = (char *) csim_alloc(b->yy_buf_size + 2 );
- if ( ! b->yy_ch_buf )
- YY_FATAL_ERROR( "out of dynamic memory in csim__create_buffer()" );
+ /* yy_ch_buf has to be 2 characters longer than the size given because
+ * we need to put in 2 end-of-buffer characters.
+ */
+ b->yy_ch_buf = (char *) csim_alloc(b->yy_buf_size + 2 );
+ if ( ! b->yy_ch_buf )
+ YY_FATAL_ERROR( "out of dynamic memory in csim__create_buffer()" );
- b->yy_is_our_buffer = 1;
+ b->yy_is_our_buffer = 1;
- csim__init_buffer(b,file );
+ csim__init_buffer(b,file );
- return b;
+ return b;
}
/** Destroy the buffer.
@@ -1649,16 +1649,16 @@ static void csim__load_buffer_state (void)
void csim__delete_buffer (YY_BUFFER_STATE b )
{
- if ( ! b )
- return;
+ if ( ! b )
+ return;
- if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
- YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+ if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+ YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
- if ( b->yy_is_our_buffer )
- csim_free((void *) b->yy_ch_buf );
+ if ( b->yy_is_our_buffer )
+ csim_free((void *) b->yy_ch_buf );
- csim_free((void *) b );
+ csim_free((void *) b );
}
#ifndef __cplusplus
@@ -1672,12 +1672,12 @@ extern int isatty (int );
static void csim__init_buffer (YY_BUFFER_STATE b, FILE * file )
{
- int oerrno = errno;
+ int oerrno = errno;
- csim__flush_buffer(b );
+ csim__flush_buffer(b );
- b->yy_input_file = file;
- b->yy_fill_buffer = 1;
+ b->yy_input_file = file;
+ b->yy_fill_buffer = 1;
/* If b is the current buffer, then csim__init_buffer was _probably_
* called from csim_restart() or through yy_get_next_buffer.
@@ -1690,7 +1690,7 @@ extern int isatty (int );
b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
- errno = oerrno;
+ errno = oerrno;
}
/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
@@ -1699,25 +1699,25 @@ extern int isatty (int );
*/
void csim__flush_buffer (YY_BUFFER_STATE b )
{
- if ( ! b )
- return;
+ if ( ! b )
+ return;
- b->yy_n_chars = 0;
+ b->yy_n_chars = 0;
- /* We always need two end-of-buffer characters. The first causes
- * a transition to the end-of-buffer state. The second causes
- * a jam in that state.
- */
- b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
- b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+ /* We always need two end-of-buffer characters. The first causes
+ * a transition to the end-of-buffer state. The second causes
+ * a jam in that state.
+ */
+ b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+ b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
- b->yy_buf_pos = &b->yy_ch_buf[0];
+ b->yy_buf_pos = &b->yy_ch_buf[0];
- b->yy_at_bol = 1;
- b->yy_buffer_status = YY_BUFFER_NEW;
+ b->yy_at_bol = 1;
+ b->yy_buffer_status = YY_BUFFER_NEW;
- if ( b == YY_CURRENT_BUFFER )
- csim__load_buffer_state( );
+ if ( b == YY_CURRENT_BUFFER )
+ csim__load_buffer_state( );
}
/** Pushes the new state onto the stack. The new state becomes
@@ -1728,28 +1728,28 @@ extern int isatty (int );
*/
void csim_push_buffer_state (YY_BUFFER_STATE new_buffer )
{
- if (new_buffer == NULL)
- return;
-
- csim_ensure_buffer_stack();
-
- /* This block is copied from csim__switch_to_buffer. */
- if ( YY_CURRENT_BUFFER )
- {
- /* Flush out information for old buffer. */
- *(yy_c_buf_p) = (yy_hold_char);
- YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
- }
-
- /* Only push if top exists. Otherwise, replace top. */
- if (YY_CURRENT_BUFFER)
- (yy_buffer_stack_top)++;
- YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
- /* copied from csim__switch_to_buffer. */
- csim__load_buffer_state( );
- (yy_did_buffer_switch_on_eof) = 1;
+ if (new_buffer == NULL)
+ return;
+
+ csim_ensure_buffer_stack();
+
+ /* This block is copied from csim__switch_to_buffer. */
+ if ( YY_CURRENT_BUFFER )
+ {
+ /* Flush out information for old buffer. */
+ *(yy_c_buf_p) = (yy_hold_char);
+ YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+ }
+
+ /* Only push if top exists. Otherwise, replace top. */
+ if (YY_CURRENT_BUFFER)
+ (yy_buffer_stack_top)++;
+ YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+ /* copied from csim__switch_to_buffer. */
+ csim__load_buffer_state( );
+ (yy_did_buffer_switch_on_eof) = 1;
}
/** Removes and deletes the top of the stack, if present.
@@ -1758,18 +1758,18 @@ void csim_push_buffer_state (YY_BUFFER_STATE new_buffer )
*/
void csim_pop_buffer_state (void)
{
- if (!YY_CURRENT_BUFFER)
- return;
-
- csim__delete_buffer(YY_CURRENT_BUFFER );
- YY_CURRENT_BUFFER_LVALUE = NULL;
- if ((yy_buffer_stack_top) > 0)
- --(yy_buffer_stack_top);
-
- if (YY_CURRENT_BUFFER) {
- csim__load_buffer_state( );
- (yy_did_buffer_switch_on_eof) = 1;
- }
+ if (!YY_CURRENT_BUFFER)
+ return;
+
+ csim__delete_buffer(YY_CURRENT_BUFFER );
+ YY_CURRENT_BUFFER_LVALUE = NULL;
+ if ((yy_buffer_stack_top) > 0)
+ --(yy_buffer_stack_top);
+
+ if (YY_CURRENT_BUFFER) {
+ csim__load_buffer_state( );
+ (yy_did_buffer_switch_on_eof) = 1;
+ }
}
/* Allocates the stack if it does not exist.
@@ -1777,45 +1777,45 @@ void csim_pop_buffer_state (void)
*/
static void csim_ensure_buffer_stack (void)
{
- int num_to_alloc;
+ int num_to_alloc;
- if (!(yy_buffer_stack)) {
+ if (!(yy_buffer_stack)) {
- /* First allocation is just for 2 elements, since we don't know if this
- * scanner will even need a stack. We use 2 instead of 1 to avoid an
- * immediate realloc on the next call.
+ /* First allocation is just for 2 elements, since we don't know if this
+ * scanner will even need a stack. We use 2 instead of 1 to avoid an
+ * immediate realloc on the next call.
*/
- num_to_alloc = 1;
- (yy_buffer_stack) = (struct yy_buffer_state**)csim_alloc
- (num_to_alloc * sizeof(struct yy_buffer_state*)
- );
- if ( ! (yy_buffer_stack) )
- YY_FATAL_ERROR( "out of dynamic memory in csim_ensure_buffer_stack()" );
-
- memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-
- (yy_buffer_stack_max) = num_to_alloc;
- (yy_buffer_stack_top) = 0;
- return;
- }
-
- if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
- /* Increase the buffer to prepare for a possible push. */
- int grow_size = 8 /* arbitrary grow size */;
-
- num_to_alloc = (yy_buffer_stack_max) + grow_size;
- (yy_buffer_stack) = (struct yy_buffer_state**)csim_realloc
- ((yy_buffer_stack),
- num_to_alloc * sizeof(struct yy_buffer_state*)
- );
- if ( ! (yy_buffer_stack) )
- YY_FATAL_ERROR( "out of dynamic memory in csim_ensure_buffer_stack()" );
-
- /* zero only the new slots.*/
- memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
- (yy_buffer_stack_max) = num_to_alloc;
- }
+ num_to_alloc = 1;
+ (yy_buffer_stack) = (struct yy_buffer_state**)csim_alloc
+ (num_to_alloc * sizeof(struct yy_buffer_state*)
+ );
+ if ( ! (yy_buffer_stack) )
+ YY_FATAL_ERROR( "out of dynamic memory in csim_ensure_buffer_stack()" );
+
+ memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+
+ (yy_buffer_stack_max) = num_to_alloc;
+ (yy_buffer_stack_top) = 0;
+ return;
+ }
+
+ if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+ /* Increase the buffer to prepare for a possible push. */
+ int grow_size = 8 /* arbitrary grow size */;
+
+ num_to_alloc = (yy_buffer_stack_max) + grow_size;
+ (yy_buffer_stack) = (struct yy_buffer_state**)csim_realloc
+ ((yy_buffer_stack),
+ num_to_alloc * sizeof(struct yy_buffer_state*)
+ );
+ if ( ! (yy_buffer_stack) )
+ YY_FATAL_ERROR( "out of dynamic memory in csim_ensure_buffer_stack()" );
+
+ /* zero only the new slots.*/
+ memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+ (yy_buffer_stack_max) = num_to_alloc;
+ }
}
/** Setup the input buffer state to scan directly from a user-specified character buffer.
@@ -1826,31 +1826,31 @@ static void csim_ensure_buffer_stack (void)
*/
YY_BUFFER_STATE csim__scan_buffer (char * base, yy_size_t size )
{
- YY_BUFFER_STATE b;
+ YY_BUFFER_STATE b;
- if ( size < 2 ||
- base[size-2] != YY_END_OF_BUFFER_CHAR ||
- base[size-1] != YY_END_OF_BUFFER_CHAR )
- /* They forgot to leave room for the EOB's. */
- return 0;
-
- b = (YY_BUFFER_STATE) csim_alloc(sizeof( struct yy_buffer_state ) );
- if ( ! b )
- YY_FATAL_ERROR( "out of dynamic memory in csim__scan_buffer()" );
-
- b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
- b->yy_buf_pos = b->yy_ch_buf = base;
- b->yy_is_our_buffer = 0;
- b->yy_input_file = 0;
- b->yy_n_chars = b->yy_buf_size;
- b->yy_is_interactive = 0;
- b->yy_at_bol = 1;
- b->yy_fill_buffer = 0;
- b->yy_buffer_status = YY_BUFFER_NEW;
-
- csim__switch_to_buffer(b );
-
- return b;
+ if ( size < 2 ||
+ base[size-2] != YY_END_OF_BUFFER_CHAR ||
+ base[size-1] != YY_END_OF_BUFFER_CHAR )
+ /* They forgot to leave room for the EOB's. */
+ return 0;
+
+ b = (YY_BUFFER_STATE) csim_alloc(sizeof( struct yy_buffer_state ) );
+ if ( ! b )
+ YY_FATAL_ERROR( "out of dynamic memory in csim__scan_buffer()" );
+
+ b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
+ b->yy_buf_pos = b->yy_ch_buf = base;
+ b->yy_is_our_buffer = 0;
+ b->yy_input_file = 0;
+ b->yy_n_chars = b->yy_buf_size;
+ b->yy_is_interactive = 0;
+ b->yy_at_bol = 1;
+ b->yy_fill_buffer = 0;
+ b->yy_buffer_status = YY_BUFFER_NEW;
+
+ csim__switch_to_buffer(b );
+
+ return b;
}
/** Setup the input buffer state to scan a string. The next call to csim_lex() will
@@ -1864,7 +1864,7 @@ YY_BUFFER_STATE csim__scan_buffer (char * base, yy_size_t size )
YY_BUFFER_STATE csim__scan_string (yyconst char * yystr )
{
- return csim__scan_bytes(yystr,strlen(yystr) );
+ return csim__scan_bytes(yystr,strlen(yystr) );
}
/** Setup the input buffer state to scan the given bytes. The next call to csim_lex() will
@@ -1876,32 +1876,32 @@ YY_BUFFER_STATE csim__scan_string (yyconst char * yystr )
*/
YY_BUFFER_STATE csim__scan_bytes (yyconst char * yybytes, int _yybytes_len )
{
- YY_BUFFER_STATE b;
- char *buf;
- yy_size_t n;
- int i;
+ YY_BUFFER_STATE b;
+ char *buf;
+ yy_size_t n;
+ int i;
- /* Get memory for full buffer, including space for trailing EOB's. */
- n = _yybytes_len + 2;
- buf = (char *) csim_alloc(n );
- if ( ! buf )
- YY_FATAL_ERROR( "out of dynamic memory in csim__scan_bytes()" );
+ /* Get memory for full buffer, including space for trailing EOB's. */
+ n = _yybytes_len + 2;
+ buf = (char *) csim_alloc(n );
+ if ( ! buf )
+ YY_FATAL_ERROR( "out of dynamic memory in csim__scan_bytes()" );
- for ( i = 0; i < _yybytes_len; ++i )
- buf[i] = yybytes[i];
+ for ( i = 0; i < _yybytes_len; ++i )
+ buf[i] = yybytes[i];
- buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+ buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
- b = csim__scan_buffer(buf,n );
- if ( ! b )
- YY_FATAL_ERROR( "bad buffer in csim__scan_bytes()" );
+ b = csim__scan_buffer(buf,n );
+ if ( ! b )
+ YY_FATAL_ERROR( "bad buffer in csim__scan_bytes()" );
- /* It's okay to grow etc. this buffer, and we should throw it
- * away when we're done.
- */
- b->yy_is_our_buffer = 1;
+ /* It's okay to grow etc. this buffer, and we should throw it
+ * away when we're done.
+ */
+ b->yy_is_our_buffer = 1;
- return b;
+ return b;
}
#ifndef YY_EXIT_FAILURE
@@ -1910,26 +1910,26 @@ YY_BUFFER_STATE csim__scan_bytes (yyconst char * yybytes, int _yybytes_len )
static void yy_fatal_error (yyconst char* msg )
{
- (void) fprintf( stderr, "%s\n", msg );
- exit( YY_EXIT_FAILURE );
+ (void) fprintf( stderr, "%s\n", msg );
+ exit( YY_EXIT_FAILURE );
}
/* Redefine yyless() so it works in section 3 code. */
#undef yyless
#define yyless(n) \
- do \
- { \
- /* Undo effects of setting up csim_text. */ \
+ do \
+ { \
+ /* Undo effects of setting up csim_text. */ \
int yyless_macro_arg = (n); \
YY_LESS_LINENO(yyless_macro_arg);\
- csim_text[csim_leng] = (yy_hold_char); \
- (yy_c_buf_p) = csim_text + yyless_macro_arg; \
- (yy_hold_char) = *(yy_c_buf_p); \
- *(yy_c_buf_p) = '\0'; \
- csim_leng = yyless_macro_arg; \
- } \
- while ( 0 )
+ csim_text[csim_leng] = (yy_hold_char); \
+ (yy_c_buf_p) = csim_text + yyless_macro_arg; \
+ (yy_hold_char) = *(yy_c_buf_p); \
+ *(yy_c_buf_p) = '\0'; \
+ csim_leng = yyless_macro_arg; \
+ } \
+ while ( 0 )
/* Accessor methods (get/set functions) to struct members. */
@@ -2044,15 +2044,15 @@ int csim_lex_destroy (void)
{
/* Pop the buffer stack, destroying each element. */
- while(YY_CURRENT_BUFFER){
- csim__delete_buffer(YY_CURRENT_BUFFER );
- YY_CURRENT_BUFFER_LVALUE = NULL;
- csim_pop_buffer_state();
- }
+ while(YY_CURRENT_BUFFER){
+ csim__delete_buffer(YY_CURRENT_BUFFER );
+ YY_CURRENT_BUFFER_LVALUE = NULL;
+ csim_pop_buffer_state();
+ }
- /* Destroy the stack itself. */
- csim_free((yy_buffer_stack) );
- (yy_buffer_stack) = NULL;
+ /* Destroy the stack itself. */
+ csim_free((yy_buffer_stack) );
+ (yy_buffer_stack) = NULL;
/* Reset the globals. This is important in a non-reentrant scanner so the next time
* csim_lex() is called, initialization will occur. */
@@ -2068,43 +2068,43 @@ int csim_lex_destroy (void)
#ifndef yytext_ptr
static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
{
- register int i;
- for ( i = 0; i < n; ++i )
- s1[i] = s2[i];
+ register int i;
+ for ( i = 0; i < n; ++i )
+ s1[i] = s2[i];
}
#endif
#ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * s )
{
- register int n;
- for ( n = 0; s[n]; ++n )
- ;
+ register int n;
+ for ( n = 0; s[n]; ++n )
+ ;
- return n;
+ return n;
}
#endif
void *csim_alloc (yy_size_t size )
{
- return (void *) malloc( size );
+ return (void *) malloc( size );
}
void *csim_realloc (void * ptr, yy_size_t size )
{
- /* The cast to (char *) in the following accommodates both
- * implementations that use char* generic pointers, and those
- * that use void* generic pointers. It works with the latter
- * because both ANSI C and C++ allow castless assignment from
- * any pointer type to void*, and deal with argument conversions
- * as though doing an assignment.
- */
- return (void *) realloc( (char *) ptr, size );
+ /* The cast to (char *) in the following accommodates both
+ * implementations that use char* generic pointers, and those
+ * that use void* generic pointers. It works with the latter
+ * because both ANSI C and C++ allow castless assignment from
+ * any pointer type to void*, and deal with argument conversions
+ * as though doing an assignment.
+ */
+ return (void *) realloc( (char *) ptr, size );
}
void csim_free (void * ptr )
{
- free( (char *) ptr ); /* see csim_realloc() for (char *) cast */
+ free( (char *) ptr ); /* see csim_realloc() for (char *) cast */
}
#define YYTABLES_NAME "yytables"
diff --git a/plug-ins/imagemap/imap_csim_parse.c b/plug-ins/imagemap/imap_csim_parse.c
index dc48604..f8e4a79 100644
--- a/plug-ins/imagemap/imap_csim_parse.c
+++ b/plug-ins/imagemap/imap_csim_parse.c
@@ -210,7 +210,7 @@ typedef union YYSTYPE
}
/* Line 187 of yacc.c. */
#line 213 "y.tab.c"
- YYSTYPE;
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
@@ -354,7 +354,7 @@ YYID (i)
# endif
# if (defined __cplusplus && ! defined _STDLIB_H \
&& ! ((defined YYMALLOC || defined malloc) \
- && (defined YYFREE || defined free)))
+ && (defined YYFREE || defined free)))
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
# ifndef _STDLIB_H
# define _STDLIB_H 1
@@ -380,7 +380,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
#if (! defined yyoverflow \
&& (! defined __cplusplus \
- || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+ || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
/* A type that is properly aligned for any stack member. */
union yyalloc
@@ -405,13 +405,13 @@ union yyalloc
# define YYCOPY(To, From, Count) \
__builtin_memcpy (To, From, (Count) * sizeof (*(From)))
# else
-# define YYCOPY(To, From, Count) \
- do \
- { \
- YYSIZE_T yyi; \
- for (yyi = 0; yyi < (Count); yyi++) \
- (To)[yyi] = (From)[yyi]; \
- } \
+# define YYCOPY(To, From, Count) \
+ do \
+ { \
+ YYSIZE_T yyi; \
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (To)[yyi] = (From)[yyi]; \
+ } \
while (YYID (0))
# endif
# endif
@@ -421,15 +421,15 @@ union yyalloc
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack) \
- do \
- { \
- YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack, Stack, yysize); \
- Stack = &yyptr->Stack; \
- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
- yyptr += yynewbytes / sizeof (*yyptr); \
- } \
+# define YYSTACK_RELOCATE(Stack) \
+ do \
+ { \
+ YYSIZE_T yynewbytes; \
+ YYCOPY (&yyptr->Stack, Stack, yysize); \
+ Stack = &yyptr->Stack; \
+ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+ yyptr += yynewbytes / sizeof (*yyptr); \
+ } \
while (YYID (0))
#endif
@@ -452,7 +452,7 @@ union yyalloc
#define YYUNDEFTOK 2
#define YYMAXUTOK 283
-#define YYTRANSLATE(YYX) \
+#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
@@ -692,44 +692,44 @@ static const yytype_uint8 yystos[] =
28, 28, 28, 28, 28, 28
};
-#define yyerrok (yyerrstatus = 0)
-#define yyclearin (yychar = YYEMPTY)
-#define YYEMPTY (-2)
-#define YYEOF 0
+#define yyerrok (yyerrstatus = 0)
+#define yyclearin (yychar = YYEMPTY)
+#define YYEMPTY (-2)
+#define YYEOF 0
-#define YYACCEPT goto yyacceptlab
-#define YYABORT goto yyabortlab
-#define YYERROR goto yyerrorlab
+#define YYACCEPT goto yyacceptlab
+#define YYABORT goto yyabortlab
+#define YYERROR goto yyerrorlab
/* Like YYERROR except do call yyerror. This remains here temporarily
to ease the transition to the new meaning of YYERROR, for GCC.
Once GCC version 2 has supplanted version 1, this can go. */
-#define YYFAIL goto yyerrlab
+#define YYFAIL goto yyerrlab
#define YYRECOVERING() (!!yyerrstatus)
-#define YYBACKUP(Token, Value) \
-do \
- if (yychar == YYEMPTY && yylen == 1) \
- { \
- yychar = (Token); \
- yylval = (Value); \
- yytoken = YYTRANSLATE (yychar); \
- YYPOPSTACK (1); \
- goto yybackup; \
- } \
- else \
- { \
+#define YYBACKUP(Token, Value) \
+do \
+ if (yychar == YYEMPTY && yylen == 1) \
+ { \
+ yychar = (Token); \
+ yylval = (Value); \
+ yytoken = YYTRANSLATE (yychar); \
+ YYPOPSTACK (1); \
+ goto yybackup; \
+ } \
+ else \
+ { \
yyerror (YY_("syntax error: cannot back up")); \
- YYERROR; \
- } \
+ YYERROR; \
+ } \
while (YYID (0))
-#define YYTERROR 1
-#define YYERRCODE 256
+#define YYTERROR 1
+#define YYERRCODE 256
/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
@@ -738,22 +738,22 @@ while (YYID (0))
#define YYRHSLOC(Rhs, K) ((Rhs)[K])
#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
- do \
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ do \
if (YYID (N)) \
- { \
- (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
- (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
- (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
- (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
- } \
- else \
- { \
- (Current).first_line = (Current).last_line = \
- YYRHSLOC (Rhs, 0).last_line; \
- (Current).first_column = (Current).last_column = \
- YYRHSLOC (Rhs, 0).last_column; \
- } \
+ { \
+ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
+ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
+ (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
+ (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
+ } \
+ else \
+ { \
+ (Current).first_line = (Current).last_line = \
+ YYRHSLOC (Rhs, 0).last_line; \
+ (Current).first_column = (Current).last_column = \
+ YYRHSLOC (Rhs, 0).last_column; \
+ } \
while (YYID (0))
#endif
@@ -764,10 +764,10 @@ while (YYID (0))
#ifndef YY_LOCATION_PRINT
# if YYLTYPE_IS_TRIVIAL
-# define YY_LOCATION_PRINT(File, Loc) \
- fprintf (File, "%d.%d-%d.%d", \
- (Loc).first_line, (Loc).first_column, \
- (Loc).last_line, (Loc).last_column)
+# define YY_LOCATION_PRINT(File, Loc) \
+ fprintf (File, "%d.%d-%d.%d", \
+ (Loc).first_line, (Loc).first_column, \
+ (Loc).last_line, (Loc).last_column)
# else
# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
# endif
@@ -790,21 +790,21 @@ while (YYID (0))
# define YYFPRINTF fprintf
# endif
-# define YYDPRINTF(Args) \
-do { \
- if (yydebug) \
- YYFPRINTF Args; \
+# define YYDPRINTF(Args) \
+do { \
+ if (yydebug) \
+ YYFPRINTF Args; \
} while (YYID (0))
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
-do { \
- if (yydebug) \
- { \
- YYFPRINTF (stderr, "%s ", Title); \
- yy_symbol_print (stderr, \
- Type, Value); \
- YYFPRINTF (stderr, "\n"); \
- } \
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+do { \
+ if (yydebug) \
+ { \
+ YYFPRINTF (stderr, "%s ", Title); \
+ yy_symbol_print (stderr, \
+ Type, Value); \
+ YYFPRINTF (stderr, "\n"); \
+ } \
} while (YYID (0))
@@ -836,7 +836,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
switch (yytype)
{
default:
- break;
+ break;
}
}
@@ -888,10 +888,10 @@ yy_stack_print (bottom, top)
YYFPRINTF (stderr, "\n");
}
-# define YY_STACK_PRINT(Bottom, Top) \
-do { \
- if (yydebug) \
- yy_stack_print ((Bottom), (Top)); \
+# define YY_STACK_PRINT(Bottom, Top) \
+do { \
+ if (yydebug) \
+ yy_stack_print ((Bottom), (Top)); \
} while (YYID (0))
@@ -914,21 +914,21 @@ yy_reduce_print (yyvsp, yyrule)
int yyi;
unsigned long int yylno = yyrline[yyrule];
YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
- yyrule - 1, yylno);
+ yyrule - 1, yylno);
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
fprintf (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
- &(yyvsp[(yyi + 1) - (yynrhs)])
- );
+ &(yyvsp[(yyi + 1) - (yynrhs)])
+ );
fprintf (stderr, "\n");
}
}
-# define YY_REDUCE_PRINT(Rule) \
-do { \
- if (yydebug) \
+# define YY_REDUCE_PRINT(Rule) \
+do { \
+ if (yydebug) \
yy_reduce_print (yyvsp, Rule); \
} while (YYID (0))
@@ -944,7 +944,7 @@ int yydebug;
/* YYINITDEPTH -- initial size of the parser's stacks. */
-#ifndef YYINITDEPTH
+#ifndef YYINITDEPTH
# define YYINITDEPTH 200
#endif
@@ -1031,27 +1031,27 @@ yytnamerr (char *yyres, const char *yystr)
char const *yyp = yystr;
for (;;)
- switch (*++yyp)
- {
- case '\'':
- case ',':
- goto do_not_strip_quotes;
-
- case '\\':
- if (*++yyp != '\\')
- goto do_not_strip_quotes;
- /* Fall through. */
- default:
- if (yyres)
- yyres[yyn] = *yyp;
- yyn++;
- break;
-
- case '"':
- if (yyres)
- yyres[yyn] = '\0';
- return yyn;
- }
+ switch (*++yyp)
+ {
+ case '\'':
+ case ',':
+ goto do_not_strip_quotes;
+
+ case '\\':
+ if (*++yyp != '\\')
+ goto do_not_strip_quotes;
+ /* Fall through. */
+ default:
+ if (yyres)
+ yyres[yyn] = *yyp;
+ yyn++;
+ break;
+
+ case '"':
+ if (yyres)
+ yyres[yyn] = '\0';
+ return yyn;
+ }
do_not_strip_quotes: ;
}
@@ -1089,7 +1089,7 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
# if 0
/* This is so xgettext sees the translatable formats that are
- constructed on the fly. */
+ constructed on the fly. */
YY_("syntax error, unexpected %s");
YY_("syntax error, unexpected %s, expecting %s");
YY_("syntax error, unexpected %s, expecting %s or %s");
@@ -1102,13 +1102,13 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
static char const yyexpecting[] = ", expecting %s";
static char const yyor[] = " or %s";
char yyformat[sizeof yyunexpected
- + sizeof yyexpecting - 1
- + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
- * (sizeof yyor - 1))];
+ + sizeof yyexpecting - 1
+ + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+ * (sizeof yyor - 1))];
char const *yyprefix = yyexpecting;
/* Start YYX at -YYN if negative to avoid negative indexes in
- YYCHECK. */
+ YYCHECK. */
int yyxbegin = yyn < 0 ? -yyn : 0;
/* Stay within bounds of both yycheck and yytname. */
@@ -1120,22 +1120,22 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
yyfmt = yystpcpy (yyformat, yyunexpected);
for (yyx = yyxbegin; yyx < yyxend; ++yyx)
- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
- {
- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
- {
- yycount = 1;
- yysize = yysize0;
- yyformat[sizeof yyunexpected - 1] = '\0';
- break;
- }
- yyarg[yycount++] = yytname[yyx];
- yysize1 = yysize + yytnamerr (0, yytname[yyx]);
- yysize_overflow |= (yysize1 < yysize);
- yysize = yysize1;
- yyfmt = yystpcpy (yyfmt, yyprefix);
- yyprefix = yyor;
- }
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+ {
+ if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+ {
+ yycount = 1;
+ yysize = yysize0;
+ yyformat[sizeof yyunexpected - 1] = '\0';
+ break;
+ }
+ yyarg[yycount++] = yytname[yyx];
+ yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+ yysize_overflow |= (yysize1 < yysize);
+ yysize = yysize1;
+ yyfmt = yystpcpy (yyfmt, yyprefix);
+ yyprefix = yyor;
+ }
yyf = YY_(yyformat);
yysize1 = yysize + yystrlen (yyf);
@@ -1143,29 +1143,29 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
yysize = yysize1;
if (yysize_overflow)
- return YYSIZE_MAXIMUM;
+ return YYSIZE_MAXIMUM;
if (yyresult)
- {
- /* Avoid sprintf, as that infringes on the user's name space.
- Don't have undefined behavior even if the translation
- produced a string with the wrong number of "%s"s. */
- char *yyp = yyresult;
- int yyi = 0;
- while ((*yyp = *yyf) != '\0')
- {
- if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
- {
- yyp += yytnamerr (yyp, yyarg[yyi++]);
- yyf += 2;
- }
- else
- {
- yyp++;
- yyf++;
- }
- }
- }
+ {
+ /* Avoid sprintf, as that infringes on the user's name space.
+ Don't have undefined behavior even if the translation
+ produced a string with the wrong number of "%s"s. */
+ char *yyp = yyresult;
+ int yyi = 0;
+ while ((*yyp = *yyf) != '\0')
+ {
+ if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+ {
+ yyp += yytnamerr (yyp, yyarg[yyi++]);
+ yyf += 2;
+ }
+ else
+ {
+ yyp++;
+ yyf++;
+ }
+ }
+ }
return yysize;
}
}
@@ -1199,7 +1199,7 @@ yydestruct (yymsg, yytype, yyvaluep)
{
default:
- break;
+ break;
}
}
@@ -1312,7 +1312,7 @@ yyparse ()
yystate = 0;
yyerrstatus = 0;
yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
+ yychar = YYEMPTY; /* Cause a token to be read. */
/* Initialize stack pointers.
Waste one element of value and location stack
@@ -1342,25 +1342,25 @@ yyparse ()
#ifdef yyoverflow
{
- /* Give user a chance to reallocate the stack. Use copies of
- these so that the &'s don't force the real ones into
- memory. */
- YYSTYPE *yyvs1 = yyvs;
- yytype_int16 *yyss1 = yyss;
+ /* Give user a chance to reallocate the stack. Use copies of
+ these so that the &'s don't force the real ones into
+ memory. */
+ YYSTYPE *yyvs1 = yyvs;
+ yytype_int16 *yyss1 = yyss;
- /* Each stack pointer address is followed by the size of the
- data in use in that stack, in bytes. This used to be a
- conditional around just the two extra args, but that might
- be undefined if yyoverflow is a macro. */
- yyoverflow (YY_("memory exhausted"),
- &yyss1, yysize * sizeof (*yyssp),
- &yyvs1, yysize * sizeof (*yyvsp),
+ /* Each stack pointer address is followed by the size of the
+ data in use in that stack, in bytes. This used to be a
+ conditional around just the two extra args, but that might
+ be undefined if yyoverflow is a macro. */
+ yyoverflow (YY_("memory exhausted"),
+ &yyss1, yysize * sizeof (*yyssp),
+ &yyvs1, yysize * sizeof (*yyvsp),
- &yystacksize);
+ &yystacksize);
- yyss = yyss1;
- yyvs = yyvs1;
+ yyss = yyss1;
+ yyvs = yyvs1;
}
#else /* no yyoverflow */
# ifndef YYSTACK_RELOCATE
@@ -1368,23 +1368,23 @@ yyparse ()
# else
/* Extend the stack our own way. */
if (YYMAXDEPTH <= yystacksize)
- goto yyexhaustedlab;
+ goto yyexhaustedlab;
yystacksize *= 2;
if (YYMAXDEPTH < yystacksize)
- yystacksize = YYMAXDEPTH;
+ yystacksize = YYMAXDEPTH;
{
- yytype_int16 *yyss1 = yyss;
- union yyalloc *yyptr =
- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
- if (! yyptr)
- goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss);
- YYSTACK_RELOCATE (yyvs);
+ yytype_int16 *yyss1 = yyss;
+ union yyalloc *yyptr =
+ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+ if (! yyptr)
+ goto yyexhaustedlab;
+ YYSTACK_RELOCATE (yyss);
+ YYSTACK_RELOCATE (yyvs);
# undef YYSTACK_RELOCATE
- if (yyss1 != yyssa)
- YYSTACK_FREE (yyss1);
+ if (yyss1 != yyssa)
+ YYSTACK_FREE (yyss1);
}
# endif
#endif /* no yyoverflow */
@@ -1394,10 +1394,10 @@ yyparse ()
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
- (unsigned long int) yystacksize));
+ (unsigned long int) yystacksize));
if (yyss + yystacksize - 1 <= yyssp)
- YYABORT;
+ YYABORT;
}
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -1446,7 +1446,7 @@ yybackup:
if (yyn <= 0)
{
if (yyn == 0 || yyn == YYTABLE_NINF)
- goto yyerrlab;
+ goto yyerrlab;
yyn = -yyn;
goto yyreduce;
}
@@ -1506,9 +1506,9 @@ yyreduce:
case 3:
#line 69 "imap_csim.y"
{
- g_strreplace(&_map_info->image_name, (yyvsp[(5) - (7)].id));
- g_free ((yyvsp[(5) - (7)].id));
- }
+ g_strreplace(&_map_info->image_name, (yyvsp[(5) - (7)].id));
+ g_free ((yyvsp[(5) - (7)].id));
+ }
break;
case 8:
@@ -1529,226 +1529,226 @@ yyreduce:
case 11:
#line 87 "imap_csim.y"
{
- _map_info->old_image_width = (yyvsp[(3) - (3)].val);
- }
+ _map_info->old_image_width = (yyvsp[(3) - (3)].val);
+ }
break;
case 12:
#line 93 "imap_csim.y"
{
- _map_info->old_image_height = (yyvsp[(3) - (3)].val);
- }
+ _map_info->old_image_height = (yyvsp[(3) - (3)].val);
+ }
break;
case 13:
#line 99 "imap_csim.y"
{
- (yyval.val) = (gint) (yyvsp[(1) - (1)].value);
- }
+ (yyval.val) = (gint) (yyvsp[(1) - (1)].value);
+ }
break;
case 14:
#line 103 "imap_csim.y"
{
- (yyval.val) = (gint) g_ascii_strtod ((yyvsp[(1) - (1)].id), NULL);
- g_free ((yyvsp[(1) - (1)].id));
- }
+ (yyval.val) = (gint) g_ascii_strtod ((yyvsp[(1) - (1)].id), NULL);
+ g_free ((yyvsp[(1) - (1)].id));
+ }
break;
case 15:
#line 110 "imap_csim.y"
{
- g_strreplace(&_map_info->title, (yyvsp[(5) - (6)].id));
- g_free ((yyvsp[(5) - (6)].id));
- }
+ g_strreplace(&_map_info->title, (yyvsp[(5) - (6)].id));
+ g_free ((yyvsp[(5) - (6)].id));
+ }
break;
case 21:
#line 126 "imap_csim.y"
{
- g_free ((yyvsp[(2) - (3)].id));
- }
+ g_free ((yyvsp[(2) - (3)].id));
+ }
break;
case 22:
#line 132 "imap_csim.y"
{
- g_strreplace(&_map_info->author, (yyvsp[(2) - (3)].id));
- g_free ((yyvsp[(2) - (3)].id));
- }
+ g_strreplace(&_map_info->author, (yyvsp[(2) - (3)].id));
+ g_free ((yyvsp[(2) - (3)].id));
+ }
break;
case 23:
#line 139 "imap_csim.y"
{
- gchar *description;
+ gchar *description;
- description = g_strconcat(_map_info->description, (yyvsp[(2) - (3)].id), "\n",
- NULL);
- g_strreplace(&_map_info->description, description);
- g_free ((yyvsp[(2) - (3)].id));
- }
+ description = g_strconcat(_map_info->description, (yyvsp[(2) - (3)].id), "\n",
+ NULL);
+ g_strreplace(&_map_info->description, description);
+ g_free ((yyvsp[(2) - (3)].id));
+ }
break;
case 26:
#line 154 "imap_csim.y"
{
- if (current_type != UNDEFINED)
- add_shape(current_object);
- }
+ if (current_type != UNDEFINED)
+ add_shape(current_object);
+ }
break;
case 41:
#line 181 "imap_csim.y"
{
- if (!g_ascii_strcasecmp((yyvsp[(3) - (3)].id), "RECT")) {
- current_object = create_rectangle(0, 0, 0, 0);
- current_type = RECTANGLE;
- } else if (!g_ascii_strcasecmp((yyvsp[(3) - (3)].id), "CIRCLE")) {
- current_object = create_circle(0, 0, 0);
- current_type = CIRCLE;
- } else if (!g_ascii_strcasecmp((yyvsp[(3) - (3)].id), "POLY")) {
- current_object = create_polygon(NULL);
- current_type = POLYGON;
- } else if (!g_ascii_strcasecmp((yyvsp[(3) - (3)].id), "DEFAULT")) {
- current_type = UNDEFINED;
- }
- g_free ((yyvsp[(3) - (3)].id));
- }
+ if (!g_ascii_strcasecmp((yyvsp[(3) - (3)].id), "RECT")) {
+ current_object = create_rectangle(0, 0, 0, 0);
+ current_type = RECTANGLE;
+ } else if (!g_ascii_strcasecmp((yyvsp[(3) - (3)].id), "CIRCLE")) {
+ current_object = create_circle(0, 0, 0);
+ current_type = CIRCLE;
+ } else if (!g_ascii_strcasecmp((yyvsp[(3) - (3)].id), "POLY")) {
+ current_object = create_polygon(NULL);
+ current_type = POLYGON;
+ } else if (!g_ascii_strcasecmp((yyvsp[(3) - (3)].id), "DEFAULT")) {
+ current_type = UNDEFINED;
+ }
+ g_free ((yyvsp[(3) - (3)].id));
+ }
break;
case 42:
#line 199 "imap_csim.y"
{
- char *p;
- if (current_type == RECTANGLE) {
- Rectangle_t *rectangle;
-
- rectangle = ObjectToRectangle(current_object);
- p = strtok((yyvsp[(3) - (3)].id), ",");
- rectangle->x = atoi(p);
- p = strtok(NULL, ",");
- rectangle->y = atoi(p);
- p = strtok(NULL, ",");
- rectangle->width = atoi(p) - rectangle->x;
- p = strtok(NULL, ",");
- rectangle->height = atoi(p) - rectangle->y;
- } else if (current_type == CIRCLE) {
- Circle_t *circle;
-
- circle = ObjectToCircle(current_object);
- p = strtok((yyvsp[(3) - (3)].id), ",");
- circle->x = atoi(p);
- p = strtok(NULL, ",");
- circle->y = atoi(p);
- p = strtok(NULL, ",");
- circle->r = atoi(p);
- } else if (current_type == POLYGON) {
- Polygon_t *polygon = ObjectToPolygon(current_object);
- GList *points;
- GdkPoint *point, *first;
- gint x, y;
-
- p = strtok((yyvsp[(3) - (3)].id), ",");
- x = atoi(p);
- p = strtok(NULL, ",");
- y = atoi(p);
- point = new_point(x, y);
- points = g_list_append(NULL, (gpointer) point);
-
- while(1) {
- p = strtok(NULL, ",");
- if (!p)
- break;
- x = atoi(p);
- p = strtok(NULL, ",");
- y = atoi(p);
- point = new_point(x, y);
- points = g_list_append(points, (gpointer) point);
- }
- /* Remove last point if duplicate */
- first = (GdkPoint*) points->data;
- polygon->points = points;
- if (first->x == point->x && first->y == point->y)
- polygon_remove_last_point(polygon);
- polygon->points = points;
- }
-
- g_free ((yyvsp[(3) - (3)].id));
- }
+ char *p;
+ if (current_type == RECTANGLE) {
+ Rectangle_t *rectangle;
+
+ rectangle = ObjectToRectangle(current_object);
+ p = strtok((yyvsp[(3) - (3)].id), ",");
+ rectangle->x = atoi(p);
+ p = strtok(NULL, ",");
+ rectangle->y = atoi(p);
+ p = strtok(NULL, ",");
+ rectangle->width = atoi(p) - rectangle->x;
+ p = strtok(NULL, ",");
+ rectangle->height = atoi(p) - rectangle->y;
+ } else if (current_type == CIRCLE) {
+ Circle_t *circle;
+
+ circle = ObjectToCircle(current_object);
+ p = strtok((yyvsp[(3) - (3)].id), ",");
+ circle->x = atoi(p);
+ p = strtok(NULL, ",");
+ circle->y = atoi(p);
+ p = strtok(NULL, ",");
+ circle->r = atoi(p);
+ } else if (current_type == POLYGON) {
+ Polygon_t *polygon = ObjectToPolygon(current_object);
+ GList *points;
+ GdkPoint *point, *first;
+ gint x, y;
+
+ p = strtok((yyvsp[(3) - (3)].id), ",");
+ x = atoi(p);
+ p = strtok(NULL, ",");
+ y = atoi(p);
+ point = new_point(x, y);
+ points = g_list_append(NULL, (gpointer) point);
+
+ while(1) {
+ p = strtok(NULL, ",");
+ if (!p)
+ break;
+ x = atoi(p);
+ p = strtok(NULL, ",");
+ y = atoi(p);
+ point = new_point(x, y);
+ points = g_list_append(points, (gpointer) point);
+ }
+ /* Remove last point if duplicate */
+ first = (GdkPoint*) points->data;
+ polygon->points = points;
+ if (first->x == point->x && first->y == point->y)
+ polygon_remove_last_point(polygon);
+ polygon->points = points;
+ }
+
+ g_free ((yyvsp[(3) - (3)].id));
+ }
break;
case 43:
#line 259 "imap_csim.y"
{
- if (current_type == UNDEFINED) {
- g_strreplace(&_map_info->default_url, (yyvsp[(3) - (3)].id));
- } else {
- object_set_url(current_object, (yyvsp[(3) - (3)].id));
- }
- g_free ((yyvsp[(3) - (3)].id));
- }
+ if (current_type == UNDEFINED) {
+ g_strreplace(&_map_info->default_url, (yyvsp[(3) - (3)].id));
+ } else {
+ object_set_url(current_object, (yyvsp[(3) - (3)].id));
+ }
+ g_free ((yyvsp[(3) - (3)].id));
+ }
break;
case 44:
#line 270 "imap_csim.y"
{
- }
+ }
break;
case 46:
#line 276 "imap_csim.y"
{
- g_free ((yyvsp[(2) - (2)].id));
- }
+ g_free ((yyvsp[(2) - (2)].id));
+ }
break;
case 47:
#line 282 "imap_csim.y"
{
- object_set_comment(current_object, (yyvsp[(3) - (3)].id));
- g_free ((yyvsp[(3) - (3)].id));
- }
+ object_set_comment(current_object, (yyvsp[(3) - (3)].id));
+ g_free ((yyvsp[(3) - (3)].id));
+ }
break;
case 48:
#line 289 "imap_csim.y"
{
- object_set_target(current_object, (yyvsp[(3) - (3)].id));
- g_free ((yyvsp[(3) - (3)].id));
- }
+ object_set_target(current_object, (yyvsp[(3) - (3)].id));
+ g_free ((yyvsp[(3) - (3)].id));
+ }
break;
case 49:
#line 296 "imap_csim.y"
{
- object_set_mouse_over(current_object, (yyvsp[(3) - (3)].id));
- g_free ((yyvsp[(3) - (3)].id));
- }
+ object_set_mouse_over(current_object, (yyvsp[(3) - (3)].id));
+ g_free ((yyvsp[(3) - (3)].id));
+ }
break;
case 50:
#line 303 "imap_csim.y"
{
- object_set_mouse_out(current_object, (yyvsp[(3) - (3)].id));
- g_free ((yyvsp[(3) - (3)].id));
- }
+ object_set_mouse_out(current_object, (yyvsp[(3) - (3)].id));
+ g_free ((yyvsp[(3) - (3)].id));
+ }
break;
case 51:
#line 310 "imap_csim.y"
{
- object_set_focus(current_object, (yyvsp[(3) - (3)].id));
- g_free ((yyvsp[(3) - (3)].id));
- }
+ object_set_focus(current_object, (yyvsp[(3) - (3)].id));
+ g_free ((yyvsp[(3) - (3)].id));
+ }
break;
case 52:
#line 317 "imap_csim.y"
{
- object_set_blur(current_object, (yyvsp[(3) - (3)].id));
- g_free ((yyvsp[(3) - (3)].id));
- }
+ object_set_blur(current_object, (yyvsp[(3) - (3)].id));
+ g_free ((yyvsp[(3) - (3)].id));
+ }
break;
@@ -1792,35 +1792,35 @@ yyerrlab:
yyerror (YY_("syntax error"));
#else
{
- YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
- if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
- {
- YYSIZE_T yyalloc = 2 * yysize;
- if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
- yyalloc = YYSTACK_ALLOC_MAXIMUM;
- if (yymsg != yymsgbuf)
- YYSTACK_FREE (yymsg);
- yymsg = (char *) YYSTACK_ALLOC (yyalloc);
- if (yymsg)
- yymsg_alloc = yyalloc;
- else
- {
- yymsg = yymsgbuf;
- yymsg_alloc = sizeof yymsgbuf;
- }
- }
-
- if (0 < yysize && yysize <= yymsg_alloc)
- {
- (void) yysyntax_error (yymsg, yystate, yychar);
- yyerror (yymsg);
- }
- else
- {
- yyerror (YY_("syntax error"));
- if (yysize != 0)
- goto yyexhaustedlab;
- }
+ YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+ if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+ {
+ YYSIZE_T yyalloc = 2 * yysize;
+ if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+ yyalloc = YYSTACK_ALLOC_MAXIMUM;
+ if (yymsg != yymsgbuf)
+ YYSTACK_FREE (yymsg);
+ yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+ if (yymsg)
+ yymsg_alloc = yyalloc;
+ else
+ {
+ yymsg = yymsgbuf;
+ yymsg_alloc = sizeof yymsgbuf;
+ }
+ }
+
+ if (0 < yysize && yysize <= yymsg_alloc)
+ {
+ (void) yysyntax_error (yymsg, yystate, yychar);
+ yyerror (yymsg);
+ }
+ else
+ {
+ yyerror (YY_("syntax error"));
+ if (yysize != 0)
+ goto yyexhaustedlab;
+ }
}
#endif
}
@@ -1830,20 +1830,20 @@ yyerrlab:
if (yyerrstatus == 3)
{
/* If just tried and failed to reuse look-ahead token after an
- error, discard it. */
+ error, discard it. */
if (yychar <= YYEOF)
- {
- /* Return failure if at end of input. */
- if (yychar == YYEOF)
- YYABORT;
- }
+ {
+ /* Return failure if at end of input. */
+ if (yychar == YYEOF)
+ YYABORT;
+ }
else
- {
- yydestruct ("Error: discarding",
- yytoken, &yylval);
- yychar = YYEMPTY;
- }
+ {
+ yydestruct ("Error: discarding",
+ yytoken, &yylval);
+ yychar = YYEMPTY;
+ }
}
/* Else will try to reuse look-ahead token after shifting the error
@@ -1875,29 +1875,29 @@ yyerrorlab:
| yyerrlab1 -- common code for both syntax error and YYERROR. |
`-------------------------------------------------------------*/
yyerrlab1:
- yyerrstatus = 3; /* Each real token shifted decrements this. */
+ yyerrstatus = 3; /* Each real token shifted decrements this. */
for (;;)
{
yyn = yypact[yystate];
if (yyn != YYPACT_NINF)
- {
- yyn += YYTERROR;
- if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
- {
- yyn = yytable[yyn];
- if (0 < yyn)
- break;
- }
- }
+ {
+ yyn += YYTERROR;
+ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+ {
+ yyn = yytable[yyn];
+ if (0 < yyn)
+ break;
+ }
+ }
/* Pop the current state because it cannot handle the error token. */
if (yyssp == yyss)
- YYABORT;
+ YYABORT;
yydestruct ("Error: popping",
- yystos[yystate], yyvsp);
+ yystos[yystate], yyvsp);
YYPOPSTACK (1);
yystate = *yyssp;
YY_STACK_PRINT (yyss, yyssp);
@@ -1943,7 +1943,7 @@ yyexhaustedlab:
yyreturn:
if (yychar != YYEOF && yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead",
- yytoken, &yylval);
+ yytoken, &yylval);
/* Do not reclaim the symbols of the rule which action triggered
this YYABORT or YYACCEPT. */
YYPOPSTACK (yylen);
@@ -1951,7 +1951,7 @@ yyreturn:
while (yyssp != yyss)
{
yydestruct ("Cleanup: popping",
- yystos[*yyssp], yyvsp);
+ yystos[*yyssp], yyvsp);
YYPOPSTACK (1);
}
#ifndef yyoverflow
diff --git a/plug-ins/imagemap/imap_csim_parse.h b/plug-ins/imagemap/imap_csim_parse.h
index 5284fa5..7248148 100644
--- a/plug-ins/imagemap/imap_csim_parse.h
+++ b/plug-ins/imagemap/imap_csim_parse.h
@@ -108,7 +108,7 @@ typedef union YYSTYPE
}
/* Line 1489 of yacc.c. */
#line 111 "y.tab.h"
- YYSTYPE;
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
diff --git a/plug-ins/imagemap/imap_default_dialog.c b/plug-ins/imagemap/imap_default_dialog.c
index 309fad3..5f1ce92 100644
--- a/plug-ins/imagemap/imap_default_dialog.c
+++ b/plug-ins/imagemap/imap_default_dialog.c
@@ -59,7 +59,7 @@ dialog_response (GtkWidget *widget,
void
default_dialog_set_ok_cb(DefaultDialog_t *dialog, void (*ok_cb)(gpointer),
- gpointer ok_cb_data)
+ gpointer ok_cb_data)
{
dialog->ok_cb = ok_cb;
dialog->ok_cb_data = ok_cb_data;
@@ -67,8 +67,8 @@ default_dialog_set_ok_cb(DefaultDialog_t *dialog, void (*ok_cb)(gpointer),
void
default_dialog_set_apply_cb(DefaultDialog_t *dialog,
- void (*apply_cb)(gpointer),
- gpointer apply_cb_data)
+ void (*apply_cb)(gpointer),
+ gpointer apply_cb_data)
{
dialog->apply_cb = apply_cb;
dialog->apply_cb_data = apply_cb_data;
@@ -76,8 +76,8 @@ default_dialog_set_apply_cb(DefaultDialog_t *dialog,
void
default_dialog_set_cancel_cb(DefaultDialog_t *dialog,
- void (*cancel_cb)(gpointer),
- gpointer cancel_cb_data)
+ void (*cancel_cb)(gpointer),
+ gpointer cancel_cb_data)
{
dialog->cancel_cb = cancel_cb;
dialog->cancel_cb_data = cancel_cb_data;
@@ -116,7 +116,7 @@ make_default_dialog (const gchar *title)
G_CALLBACK (dialog_response),
data);
g_signal_connect (data->dialog, "destroy",
- G_CALLBACK (gtk_widget_destroyed),
+ G_CALLBACK (gtk_widget_destroyed),
&data->dialog);
data->vbox = gtk_vbox_new (FALSE, 12);
diff --git a/plug-ins/imagemap/imap_default_dialog.h b/plug-ins/imagemap/imap_default_dialog.h
index 56aee1b..bb646bf 100644
--- a/plug-ins/imagemap/imap_default_dialog.h
+++ b/plug-ins/imagemap/imap_default_dialog.h
@@ -25,28 +25,28 @@
typedef struct
{
- GtkWidget *dialog;
+ GtkWidget *dialog;
GtkWidget *vbox;
- GtkWidget *ok;
- GtkWidget *apply;
- GtkWidget *cancel;
- void (*ok_cb)(gpointer);
- gpointer ok_cb_data;
- void (*apply_cb)(gpointer);
- gpointer apply_cb_data;
- void (*cancel_cb)(gpointer);
- gpointer cancel_cb_data;
+ GtkWidget *ok;
+ GtkWidget *apply;
+ GtkWidget *cancel;
+ void (*ok_cb)(gpointer);
+ gpointer ok_cb_data;
+ void (*apply_cb)(gpointer);
+ gpointer apply_cb_data;
+ void (*cancel_cb)(gpointer);
+ gpointer cancel_cb_data;
} DefaultDialog_t;
DefaultDialog_t *make_default_dialog(const gchar *title);
void default_dialog_set_ok_cb(DefaultDialog_t *dialog, void (*ok_cb)(gpointer),
- gpointer ok_cb_data);
+ gpointer ok_cb_data);
void default_dialog_set_apply_cb(DefaultDialog_t *dialog,
- void (*apply_cb)(gpointer),
- gpointer apply_cb_data);
+ void (*apply_cb)(gpointer),
+ gpointer apply_cb_data);
void default_dialog_set_cancel_cb(DefaultDialog_t *dialog,
- void (*ok_cb)(gpointer),
- gpointer ok_cb_data);
+ void (*ok_cb)(gpointer),
+ gpointer ok_cb_data);
void default_dialog_show(DefaultDialog_t *dialog);
void default_dialog_hide_cancel_button(DefaultDialog_t *dialog);
void default_dialog_hide_apply_button(DefaultDialog_t *dialog);
@@ -54,6 +54,6 @@ void default_dialog_hide_help_button(DefaultDialog_t *dialog);
void default_dialog_set_title(DefaultDialog_t *dialog, const gchar *title);
void default_dialog_set_label(DefaultDialog_t *dialog, const gchar *text);
GtkWidget *default_dialog_add_table(DefaultDialog_t *dialog, gint rows,
- gint cols);
+ gint cols);
#endif /* _IMAP_DEFAULT_DIALOG_H */
diff --git a/plug-ins/imagemap/imap_edit_area_info.c b/plug-ins/imagemap/imap_edit_area_info.c
index 2c360ab..9c965be 100644
--- a/plug-ins/imagemap/imap_edit_area_info.c
+++ b/plug-ins/imagemap/imap_edit_area_info.c
@@ -100,11 +100,11 @@ set_url(GtkWidget *widget, AreaInfoDialog_t *param, const gchar *prefix)
}
else
{
- p = strchr(url, ':'); /* 'mailto:' */
+ p = strchr(url, ':'); /* 'mailto:' */
if (p)
{
p++;
- if (*p == '/') /* 'file:/' */
+ if (*p == '/') /* 'file:/' */
p++;
}
else
@@ -171,7 +171,7 @@ select_email_cb(GtkWidget *widget, AreaInfoDialog_t *param)
static void
append_page (GtkWidget *notebook, GtkWidget *page, const gchar *icon_name,
- const gchar *label_name)
+ const gchar *label_name)
{
GtkWidget *hbox, *icon, *label;
@@ -211,49 +211,49 @@ create_link_tab(AreaInfoDialog_t *dialog, GtkWidget *notebook)
gtk_widget_show(subtable);
dialog->web_site = create_radio_button_in_table(subtable, NULL, 0, 0,
- _("_Web Site"));
+ _("_Web Site"));
g_signal_connect(dialog->web_site, "toggled",
G_CALLBACK (select_web_cb), (gpointer) dialog);
group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(dialog->web_site));
dialog->ftp_site = create_radio_button_in_table(subtable, group, 0, 1,
- _("_Ftp Site"));
+ _("_Ftp Site"));
g_signal_connect(dialog->ftp_site, "toggled",
G_CALLBACK (select_ftp_cb), (gpointer) dialog);
group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(dialog->ftp_site));
dialog->gopher = create_radio_button_in_table(subtable, group, 0, 2,
- _("_Gopher"));
+ _("_Gopher"));
g_signal_connect(dialog->gopher, "toggled",
G_CALLBACK (select_gopher_cb), (gpointer) dialog);
group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(dialog->gopher));
dialog->other = create_radio_button_in_table(subtable, group, 0, 3,
- _("Ot_her"));
+ _("Ot_her"));
g_signal_connect(dialog->other, "toggled",
G_CALLBACK (select_other_cb), (gpointer) dialog);
group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(dialog->other));
dialog->file = create_radio_button_in_table(subtable, group, 1, 0,
- _("F_ile"));
+ _("F_ile"));
g_signal_connect(dialog->file, "toggled",
G_CALLBACK (select_file_cb), (gpointer) dialog);
group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(dialog->file));
dialog->wais = create_radio_button_in_table(subtable, group, 1, 1,
- _("WAI_S"));
+ _("WAI_S"));
g_signal_connect(dialog->wais, "toggled",
G_CALLBACK (select_wais_cb), (gpointer) dialog);
group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(dialog->wais));
dialog->telnet = create_radio_button_in_table(subtable, group, 1, 2,
- _("Tel_net"));
+ _("Tel_net"));
g_signal_connect(dialog->telnet, "toggled",
G_CALLBACK (select_telnet_cb), (gpointer) dialog);
group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(dialog->telnet));
dialog->email = create_radio_button_in_table(subtable, group, 1, 3,
- _("e-_mail"));
+ _("e-_mail"));
g_signal_connect(dialog->email, "toggled",
G_CALLBACK (select_email_cb), (gpointer) dialog);
@@ -266,13 +266,13 @@ create_link_tab(AreaInfoDialog_t *dialog, GtkWidget *notebook)
gtk_table_attach_defaults(GTK_TABLE(table), browse->hbox, 0, 1, 3, 4);
dialog->url = browse->file;
g_signal_connect(dialog->url, "changed", G_CALLBACK(url_changed),
- dialog);
+ dialog);
gtk_label_set_mnemonic_widget(GTK_LABEL(label), dialog->url);
dialog->relative_link = create_check_button_in_table(table, 4, 0,
- _("Relati_ve link"));
+ _("Relati_ve link"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->relative_link),
- TRUE);
+ TRUE);
label = create_label_in_table(
table, 6, 0,
@@ -293,8 +293,8 @@ geometry_changed(Object_t *obj, gpointer data)
dialog->geometry_lock = FALSE;
} else {
if (dialog->obj == obj) {
- object_update_info_widget(obj, dialog->infotab);
- obj->class->assign(obj, dialog->clone);
+ object_update_info_widget(obj, dialog->infotab);
+ obj->class->assign(obj, dialog->clone);
}
}
}
@@ -329,7 +329,7 @@ create_info_tab(AreaInfoDialog_t *dialog, GtkWidget *notebook)
dialog->infotab = obj->class->create_info_widget(frame);
append_page (notebook, vbox, obj->class->get_stock_icon_name (),
- gettext (obj->class->name));
+ gettext (obj->class->name));
}
static void
@@ -386,7 +386,7 @@ edit_area_apply_cb(gpointer data)
object_set_target(obj, gtk_entry_get_text(GTK_ENTRY(param->target)));
object_set_comment(obj, gtk_entry_get_text(GTK_ENTRY(param->comment)));
object_set_mouse_over(obj,
- gtk_entry_get_text(GTK_ENTRY(param->mouse_over)));
+ gtk_entry_get_text(GTK_ENTRY(param->mouse_over)));
object_set_mouse_out(obj, gtk_entry_get_text(GTK_ENTRY(param->mouse_out)));
object_set_focus(obj, gtk_entry_get_text(GTK_ENTRY(param->focus)));
object_set_blur(obj, gtk_entry_get_text(GTK_ENTRY(param->blur)));
@@ -434,7 +434,7 @@ edit_area_cancel_cb(gpointer data)
static void
switch_page(GtkWidget *widget, gpointer page, gint page_num,
- gpointer data)
+ gpointer data)
{
AreaInfoDialog_t *param = (AreaInfoDialog_t*) data;
if (page_num == 0) {
@@ -477,7 +477,7 @@ create_edit_area_info_dialog(Object_t *obj)
void
edit_area_info_dialog_show(AreaInfoDialog_t *dialog, Object_t *obj,
- gboolean add)
+ gboolean add)
{
gchar *title;
@@ -500,7 +500,7 @@ edit_area_info_dialog_show(AreaInfoDialog_t *dialog, Object_t *obj,
object_list_add_geometry_cb(obj->list, geometry_changed, dialog);
title = g_strdup_printf (_("Area #%d Settings"),
- object_get_position_in_list(obj) + 1);
+ object_get_position_in_list(obj) + 1);
default_dialog_set_title(dialog->dialog, title);
g_free (title);
default_dialog_show(dialog->dialog);
diff --git a/plug-ins/imagemap/imap_edit_area_info.h b/plug-ins/imagemap/imap_edit_area_info.h
index ac87437..e987fb1 100644
--- a/plug-ins/imagemap/imap_edit_area_info.h
+++ b/plug-ins/imagemap/imap_edit_area_info.h
@@ -30,37 +30,37 @@ typedef struct AreaInfoDialog_t AreaInfoDialog_t;
struct AreaInfoDialog_t {
DefaultDialog_t *dialog;
- Object_t *obj;
- Object_t *clone;
- gboolean add;
- gboolean geometry_lock;
- gboolean preview;
+ Object_t *obj;
+ Object_t *clone;
+ gboolean add;
+ gboolean geometry_lock;
+ gboolean preview;
- GtkWidget *notebook;
- GtkWidget *web_site;
- GtkWidget *ftp_site;
- GtkWidget *gopher;
- GtkWidget *other;
- GtkWidget *file;
- GtkWidget *wais;
- GtkWidget *telnet;
- GtkWidget *email;
- GtkWidget *url;
- GtkWidget *relative_link;
- GtkWidget *target;
- GtkWidget *comment;
- GtkWidget *mouse_over;
- GtkWidget *mouse_out;
- GtkWidget *focus;
- GtkWidget *blur;
- GtkWidget *browse;
- gpointer infotab;
- gpointer geometry_cb_id;
+ GtkWidget *notebook;
+ GtkWidget *web_site;
+ GtkWidget *ftp_site;
+ GtkWidget *gopher;
+ GtkWidget *other;
+ GtkWidget *file;
+ GtkWidget *wais;
+ GtkWidget *telnet;
+ GtkWidget *email;
+ GtkWidget *url;
+ GtkWidget *relative_link;
+ GtkWidget *target;
+ GtkWidget *comment;
+ GtkWidget *mouse_over;
+ GtkWidget *mouse_out;
+ GtkWidget *focus;
+ GtkWidget *blur;
+ GtkWidget *browse;
+ gpointer infotab;
+ gpointer geometry_cb_id;
};
AreaInfoDialog_t *create_edit_area_info_dialog(Object_t *obj);
void edit_area_info_dialog_show(AreaInfoDialog_t *dialog, Object_t *obj,
- gboolean add);
+ gboolean add);
void edit_area_info_dialog_emit_geometry_signal(AreaInfoDialog_t *dialog);
#endif /* _IMAP_EDIT_AREA_INFO_H */
diff --git a/plug-ins/imagemap/imap_file.c b/plug-ins/imagemap/imap_file.c
index 650c348..e0fcb25 100644
--- a/plug-ins/imagemap/imap_file.c
+++ b/plug-ins/imagemap/imap_file.c
@@ -176,7 +176,7 @@ do_file_error_dialog (const char *error,
gimp_filename_to_utf8 (filename));
g_signal_connect_swapped (dialog, "response",
- G_CALLBACK (gtk_widget_destroy),
- dialog);
+ G_CALLBACK (gtk_widget_destroy),
+ dialog);
gtk_dialog_run (GTK_DIALOG (dialog));
}
diff --git a/plug-ins/imagemap/imap_grid.c b/plug-ins/imagemap/imap_grid.c
index 3803139..1a77b02 100644
--- a/plug-ins/imagemap/imap_grid.c
+++ b/plug-ins/imagemap/imap_grid.c
@@ -127,7 +127,7 @@ grid_assign_value(GtkWidget *widget, gpointer data, gint *value)
GridDialog_t *dialog = (GridDialog_t*) data;
if (dialog->enable_preview) {
*value = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
- redraw_preview(); /* Fix me! */
+ redraw_preview(); /* Fix me! */
}
}
@@ -138,7 +138,7 @@ width_changed_cb(GtkWidget *widget, gpointer data)
grid_assign_value(widget, data, &grid_width);
if (gimp_chain_button_get_active(
- GIMP_CHAIN_BUTTON(dialog->chain_width_height))) {
+ GIMP_CHAIN_BUTTON(dialog->chain_width_height))) {
gint value = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->height), value);
}
@@ -151,7 +151,7 @@ height_changed_cb(GtkWidget *widget, gpointer data)
grid_assign_value(widget, data, &grid_height);
if (gimp_chain_button_get_active(
- GIMP_CHAIN_BUTTON(dialog->chain_width_height))) {
+ GIMP_CHAIN_BUTTON(dialog->chain_width_height))) {
gint value = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->width), value);
}
@@ -164,7 +164,7 @@ left_changed_cb(GtkWidget *widget, gpointer data)
grid_assign_value(widget, data, &grid_left);
if (gimp_chain_button_get_active(
- GIMP_CHAIN_BUTTON(dialog->chain_left_top))) {
+ GIMP_CHAIN_BUTTON(dialog->chain_left_top))) {
gint value = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->top), value);
}
@@ -177,7 +177,7 @@ top_changed_cb(GtkWidget *widget, gpointer data)
grid_assign_value(widget, data, &grid_top);
if (gimp_chain_button_get_active(
- GIMP_CHAIN_BUTTON(dialog->chain_left_top))) {
+ GIMP_CHAIN_BUTTON(dialog->chain_left_top))) {
gint value = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->left), value);
}
@@ -286,7 +286,7 @@ create_grid_settings_dialog(void)
gtk_widget_show(chain_button);
data->preview = create_check_button_in_table(main_table, 3, 0,
- _("_Preview"));
+ _("_Preview"));
g_signal_connect(data->preview, "toggled",
G_CALLBACK (toggle_preview_cb), (gpointer) data);
gtk_widget_show(data->preview);
@@ -343,8 +343,8 @@ draw_crosses(GdkWindow *window, GdkGC* gc, gint width, gint height)
for (x = grid_left; x < width; x += grid_width) {
for (y = grid_top; y < height; y += grid_height) {
- draw_line(window, gc, x - 3, y, x + 3, y);
- draw_line(window, gc, x, y - 3, x, y + 3);
+ draw_line(window, gc, x - 3, y, x + 3, y);
+ draw_line(window, gc, x, y - 3, x, y + 3);
}
}
}
diff --git a/plug-ins/imagemap/imap_main.c b/plug-ins/imagemap/imap_main.c
index 796ecce..358eac1 100644
--- a/plug-ins/imagemap/imap_main.c
+++ b/plug-ins/imagemap/imap_main.c
@@ -1085,28 +1085,28 @@ key_press_cb(GtkWidget *widget, GdkEventKey *event)
switch (event->keyval) {
case GDK_Left:
- if (ctrl)
+ if (ctrl)
move_sash_selected_objects(-1, 0, shift);
else
move_selected_objects(-1, 0, shift);
handled = TRUE;
break;
case GDK_Right:
- if (ctrl)
+ if (ctrl)
move_sash_selected_objects(1, 0, shift);
else
move_selected_objects(1, 0, shift);
handled = TRUE;
break;
case GDK_Up:
- if (ctrl)
+ if (ctrl)
move_sash_selected_objects(0, -1, shift);
else
move_selected_objects(0, -1, shift);
handled = TRUE;
break;
case GDK_Down:
- if (ctrl)
+ if (ctrl)
move_sash_selected_objects(0, 1, shift);
else
move_selected_objects(0, 1, shift);
diff --git a/plug-ins/imagemap/imap_main.h b/plug-ins/imagemap/imap_main.h
index c4e32b1..2d8307f 100644
--- a/plug-ins/imagemap/imap_main.h
+++ b/plug-ins/imagemap/imap_main.h
@@ -41,7 +41,7 @@ typedef struct {
gchar *description;
gint old_image_width;
gint old_image_height;
- gboolean color; /* Color (TRUE) or Gray (FALSE) */
+ gboolean color; /* Color (TRUE) or Gray (FALSE) */
gboolean show_gray;
} MapInfo_t;
@@ -66,13 +66,13 @@ void main_toolbar_set_grid(gboolean active);
void set_zoom(gint zoom_factor);
gint get_real_coord(gint coord);
void draw_line(GdkWindow *window, GdkGC *gc, gint x1, gint y1, gint x2,
- gint y2);
+ gint y2);
void draw_rectangle(GdkWindow *window, GdkGC *gc, gint filled, gint x, gint y,
- gint width, gint height);
+ gint width, gint height);
void draw_arc(GdkWindow *window, GdkGC *gc, gint filled, gint x, gint y,
- gint width, gint height, gint angle1, gint angle2);
+ gint width, gint height, gint angle1, gint angle2);
void draw_circle(GdkWindow *window, GdkGC *gc, gint filled, gint x, gint y,
- gint r);
+ gint r);
void draw_polygon(GdkWindow *window, GdkGC *gc, GList *list);
const char *get_filename(void);
diff --git a/plug-ins/imagemap/imap_menu.c b/plug-ins/imagemap/imap_menu.c
index ab3e8ef..c6df8e0 100644
--- a/plug-ins/imagemap/imap_menu.c
+++ b/plug-ins/imagemap/imap_menu.c
@@ -393,19 +393,19 @@ make_menu(GtkWidget *main_vbox, GtkWidget *window)
gtk_action_group_set_translation_domain (action_group, NULL);
gtk_action_group_add_actions (action_group, entries, G_N_ELEMENTS (entries),
- window);
+ window);
gtk_action_group_add_toggle_actions (action_group, toggle_entries,
- G_N_ELEMENTS (toggle_entries), window);
+ G_N_ELEMENTS (toggle_entries), window);
gtk_action_group_add_radio_actions (action_group, color_entries,
- G_N_ELEMENTS (color_entries), 0,
- G_CALLBACK (set_preview_color), NULL);
+ G_N_ELEMENTS (color_entries), 0,
+ G_CALLBACK (set_preview_color), NULL);
gtk_action_group_add_radio_actions (action_group, zoom_entries,
- G_N_ELEMENTS (zoom_entries), 0,
- G_CALLBACK (set_zoom_factor), NULL);
+ G_N_ELEMENTS (zoom_entries), 0,
+ G_CALLBACK (set_zoom_factor), NULL);
gtk_action_group_add_radio_actions (action_group, mapping_entries,
- G_N_ELEMENTS (mapping_entries), 0,
- G_CALLBACK (set_func), window);
+ G_N_ELEMENTS (mapping_entries), 0,
+ G_CALLBACK (set_func), window);
ui_manager = gtk_ui_manager_new ();
gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
@@ -415,7 +415,7 @@ make_menu(GtkWidget *main_vbox, GtkWidget *window)
error = NULL;
if (!gtk_ui_manager_add_ui_from_string (ui_manager, ui_description, -1,
- &error))
+ &error))
{
g_warning ("building menus failed: %s", error->message);
g_error_free (error);
@@ -456,7 +456,7 @@ menu_build_mru_items(MRU_t *mru)
children = gtk_container_get_children(GTK_CONTAINER(_menu.open_recent));
p = g_list_nth(children, position);
for (i = 0; i < _menu.nr_off_mru_items; i++, p = p->next) {
- gtk_widget_destroy((GtkWidget*) p->data);
+ gtk_widget_destroy((GtkWidget*) p->data);
}
g_list_free(children);
}
@@ -464,11 +464,11 @@ menu_build_mru_items(MRU_t *mru)
i = 0;
for (p = mru->list; p; p = p->next, i++) {
GtkWidget *item = insert_item_with_label(_menu.open_recent, position++,
- (gchar*) p->data,
- menu_mru, p->data);
+ (gchar*) p->data,
+ menu_mru, p->data);
if (i < 9) {
- guchar accelerator_key = '1' + i;
- add_accelerator(item, accelerator_key, GDK_CONTROL_MASK);
+ guchar accelerator_key = '1' + i;
+ add_accelerator(item, accelerator_key, GDK_CONTROL_MASK);
}
}
_menu.nr_off_mru_items = i;
@@ -479,14 +479,14 @@ do_main_popup_menu(GdkEventButton *event)
{
GtkWidget *popup = gtk_ui_manager_get_widget (ui_manager, "/PopupMenu");
gtk_menu_popup (GTK_MENU (popup), NULL, NULL, NULL, NULL,
- event->button, event->time);
+ event->button, event->time);
}
void
menu_check_grid(gboolean check)
{
GtkAction *action = gtk_ui_manager_get_action (ui_manager,
- "/MainMenu/ToolsMenu/Grid");
+ "/MainMenu/ToolsMenu/Grid");
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), check);
}
diff --git a/plug-ins/imagemap/imap_menu.h b/plug-ins/imagemap/imap_menu.h
index 1c987e7..6dae181 100644
--- a/plug-ins/imagemap/imap_menu.h
+++ b/plug-ins/imagemap/imap_menu.h
@@ -44,7 +44,7 @@ typedef struct {
GtkWidget *zoom_in;
GtkWidget *zoom_out;
- gint nr_off_mru_items;
+ gint nr_off_mru_items;
} Menu_t;
GtkWidget *menu_get_widget(const gchar *path);
diff --git a/plug-ins/imagemap/imap_menu_funcs.c b/plug-ins/imagemap/imap_menu_funcs.c
index a51c083..046b36d 100644
--- a/plug-ins/imagemap/imap_menu_funcs.c
+++ b/plug-ins/imagemap/imap_menu_funcs.c
@@ -38,16 +38,16 @@ init_accel_group(GtkWidget *window)
void
add_accelerator(GtkWidget *widget, guint accelerator_key,
- guint8 accelerator_mods)
+ guint8 accelerator_mods)
{
gtk_widget_add_accelerator(widget, "activate", accelerator_group,
- accelerator_key, accelerator_mods,
- GTK_ACCEL_VISIBLE);
+ accelerator_key, accelerator_mods,
+ GTK_ACCEL_VISIBLE);
}
GtkWidget*
insert_item_with_label(GtkWidget *parent, gint position, gchar *label,
- MenuCallback activate, gpointer data)
+ MenuCallback activate, gpointer data)
{
GtkWidget *item = gtk_image_menu_item_new_with_mnemonic(label);
gtk_menu_shell_insert(GTK_MENU_SHELL(parent), item, position);
diff --git a/plug-ins/imagemap/imap_menu_funcs.h b/plug-ins/imagemap/imap_menu_funcs.h
index 5f5090b..682cb54 100644
--- a/plug-ins/imagemap/imap_menu_funcs.h
+++ b/plug-ins/imagemap/imap_menu_funcs.h
@@ -27,13 +27,13 @@ typedef void (*MenuCallback)(GtkWidget *widget, gpointer data);
void init_accel_group(GtkWidget *window);
GtkWidget *insert_item_with_label(GtkWidget *parent, gint position,
- gchar *label, MenuCallback activate,
- gpointer data);
+ gchar *label, MenuCallback activate,
+ gpointer data);
void menu_command(GtkWidget *widget, gpointer data);
void add_accelerator(GtkWidget *widget, guint accelerator_key,
- guint8 accelerator_mods);
+ guint8 accelerator_mods);
#endif /* _IMAP_MENU_FUNCS_H */
diff --git a/plug-ins/imagemap/imap_misc.c b/plug-ins/imagemap/imap_misc.c
index 8849632..b99d4c8 100644
--- a/plug-ins/imagemap/imap_misc.c
+++ b/plug-ins/imagemap/imap_misc.c
@@ -41,7 +41,7 @@ void
draw_sash(GdkWindow *window, GdkGC *gc, gint x, gint y)
{
draw_rectangle(window, gc, TRUE, x - _sash_size / 2, y - _sash_size / 2,
- _sash_size, _sash_size);
+ _sash_size, _sash_size);
}
gboolean
diff --git a/plug-ins/imagemap/imap_mru.c b/plug-ins/imagemap/imap_mru.c
index 415e306..d023637 100644
--- a/plug-ins/imagemap/imap_mru.c
+++ b/plug-ins/imagemap/imap_mru.c
@@ -59,7 +59,7 @@ static GList*
mru_find_link(MRU_t *mru, const gchar *filename)
{
return g_list_find_custom(mru->list, (gpointer) filename,
- (GCompareFunc) strcmp);
+ (GCompareFunc) strcmp);
}
void
@@ -82,7 +82,7 @@ mru_set_first(MRU_t *mru, const gchar *filename)
GList *link = mru_find_link(mru, filename);
if (link)
mru->list = g_list_prepend(g_list_remove_link(mru->list, link),
- link->data);
+ link->data);
else
mru_add(mru, filename);
}
diff --git a/plug-ins/imagemap/imap_mru.h b/plug-ins/imagemap/imap_mru.h
index 7cc53b0..eca8a4d 100644
--- a/plug-ins/imagemap/imap_mru.h
+++ b/plug-ins/imagemap/imap_mru.h
@@ -29,7 +29,7 @@
typedef struct {
GList *list;
- gint max_size;
+ gint max_size;
} MRU_t;
MRU_t* mru_create(void);
diff --git a/plug-ins/imagemap/imap_ncsa_lex.c b/plug-ins/imagemap/imap_ncsa_lex.c
index de53ee6..8de955b 100644
--- a/plug-ins/imagemap/imap_ncsa_lex.c
+++ b/plug-ins/imagemap/imap_ncsa_lex.c
@@ -111,15 +111,15 @@ typedef unsigned int flex_uint32_t;
/* The "const" storage-class-modifier is valid. */
#define YY_USE_CONST
-#else /* ! __cplusplus */
+#else /* ! __cplusplus */
/* C99 requires __STDC__ to be defined as 1. */
#if defined (__STDC__)
#define YY_USE_CONST
-#endif /* defined (__STDC__) */
-#endif /* ! __cplusplus */
+#endif /* defined (__STDC__) */
+#endif /* ! __cplusplus */
#ifdef YY_USE_CONST
#define yyconst const
@@ -192,17 +192,17 @@ extern FILE *ncsa_in, *ncsa_out;
/* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \
- do \
- { \
- /* Undo effects of setting up ncsa_text. */ \
+ do \
+ { \
+ /* Undo effects of setting up ncsa_text. */ \
int yyless_macro_arg = (n); \
YY_LESS_LINENO(yyless_macro_arg);\
- *yy_cp = (yy_hold_char); \
- YY_RESTORE_YY_MORE_OFFSET \
- (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
- YY_DO_BEFORE_ACTION; /* set up ncsa_text again */ \
- } \
- while ( 0 )
+ *yy_cp = (yy_hold_char); \
+ YY_RESTORE_YY_MORE_OFFSET \
+ (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+ YY_DO_BEFORE_ACTION; /* set up ncsa_text again */ \
+ } \
+ while ( 0 )
#define unput(c) yyunput( c, (yytext_ptr) )
@@ -214,66 +214,66 @@ typedef size_t yy_size_t;
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
- {
- FILE *yy_input_file;
-
- char *yy_ch_buf; /* input buffer */
- char *yy_buf_pos; /* current position in input buffer */
-
- /* Size of input buffer in bytes, not including room for EOB
- * characters.
- */
- yy_size_t yy_buf_size;
-
- /* Number of characters read into yy_ch_buf, not including EOB
- * characters.
- */
- int yy_n_chars;
-
- /* Whether we "own" the buffer - i.e., we know we created it,
- * and can realloc() it to grow it, and should free() it to
- * delete it.
- */
- int yy_is_our_buffer;
-
- /* Whether this is an "interactive" input source; if so, and
- * if we're using stdio for input, then we want to use getc()
- * instead of fread(), to make sure we stop fetching input after
- * each newline.
- */
- int yy_is_interactive;
-
- /* Whether we're considered to be at the beginning of a line.
- * If so, '^' rules will be active on the next match, otherwise
- * not.
- */
- int yy_at_bol;
+ {
+ FILE *yy_input_file;
+
+ char *yy_ch_buf; /* input buffer */
+ char *yy_buf_pos; /* current position in input buffer */
+
+ /* Size of input buffer in bytes, not including room for EOB
+ * characters.
+ */
+ yy_size_t yy_buf_size;
+
+ /* Number of characters read into yy_ch_buf, not including EOB
+ * characters.
+ */
+ int yy_n_chars;
+
+ /* Whether we "own" the buffer - i.e., we know we created it,
+ * and can realloc() it to grow it, and should free() it to
+ * delete it.
+ */
+ int yy_is_our_buffer;
+
+ /* Whether this is an "interactive" input source; if so, and
+ * if we're using stdio for input, then we want to use getc()
+ * instead of fread(), to make sure we stop fetching input after
+ * each newline.
+ */
+ int yy_is_interactive;
+
+ /* Whether we're considered to be at the beginning of a line.
+ * If so, '^' rules will be active on the next match, otherwise
+ * not.
+ */
+ int yy_at_bol;
int yy_bs_lineno; /**< The line count. */
int yy_bs_column; /**< The column count. */
- /* Whether to try to fill the input buffer when we reach the
- * end of it.
- */
- int yy_fill_buffer;
+ /* Whether to try to fill the input buffer when we reach the
+ * end of it.
+ */
+ int yy_fill_buffer;
- int yy_buffer_status;
+ int yy_buffer_status;
#define YY_BUFFER_NEW 0
#define YY_BUFFER_NORMAL 1
- /* When an EOF's been seen but there's still some text to process
- * then we mark the buffer as YY_EOF_PENDING, to indicate that we
- * shouldn't try reading from the input source any more. We might
- * still have a bunch of tokens to match, though, because of
- * possible backing-up.
- *
- * When we actually see the EOF, we change the status to "new"
- * (via ncsa_restart()), so that the user can continue scanning by
- * just pointing ncsa_in at a new input file.
- */
+ /* When an EOF's been seen but there's still some text to process
+ * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+ * shouldn't try reading from the input source any more. We might
+ * still have a bunch of tokens to match, though, because of
+ * possible backing-up.
+ *
+ * When we actually see the EOF, we change the status to "new"
+ * (via ncsa_restart()), so that the user can continue scanning by
+ * just pointing ncsa_in at a new input file.
+ */
#define YY_BUFFER_EOF_PENDING 2
- };
+ };
#endif /* !YY_STRUCT_YY_BUFFER_STATE */
/* Stack of input buffers. */
@@ -298,13 +298,13 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
/* yy_hold_char holds the character lost when ncsa_text is formed. */
static char yy_hold_char;
-static int yy_n_chars; /* number of characters read into yy_ch_buf */
+static int yy_n_chars; /* number of characters read into yy_ch_buf */
int ncsa_leng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 0; /* whether we need to initialize */
-static int yy_start = 0; /* start state number */
+static int yy_init = 0; /* whether we need to initialize */
+static int yy_start = 0; /* start state number */
/* Flag which is used to allow ncsa_wrap()'s to do buffer switches
* instead of setting up a fresh ncsa_in. A bit of a hack ...
@@ -336,24 +336,24 @@ void ncsa_free (void * );
#define yy_new_buffer ncsa__create_buffer
#define yy_set_interactive(is_interactive) \
- { \
- if ( ! YY_CURRENT_BUFFER ){ \
+ { \
+ if ( ! YY_CURRENT_BUFFER ){ \
ncsa_ensure_buffer_stack (); \
- YY_CURRENT_BUFFER_LVALUE = \
+ YY_CURRENT_BUFFER_LVALUE = \
ncsa__create_buffer(ncsa_in,YY_BUF_SIZE ); \
- } \
- YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
- }
+ } \
+ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+ }
#define yy_set_bol(at_bol) \
- { \
- if ( ! YY_CURRENT_BUFFER ){\
+ { \
+ if ( ! YY_CURRENT_BUFFER ){\
ncsa_ensure_buffer_stack (); \
- YY_CURRENT_BUFFER_LVALUE = \
+ YY_CURRENT_BUFFER_LVALUE = \
ncsa__create_buffer(ncsa_in,YY_BUF_SIZE ); \
- } \
- YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
- }
+ } \
+ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+ }
#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
@@ -384,21 +384,21 @@ static void yy_fatal_error (yyconst char msg[] );
* corresponding action - sets up ncsa_text.
*/
#define YY_DO_BEFORE_ACTION \
- (yytext_ptr) = yy_bp; \
- ncsa_leng = (size_t) (yy_cp - yy_bp); \
- (yy_hold_char) = *yy_cp; \
- *yy_cp = '\0'; \
- (yy_c_buf_p) = yy_cp;
+ (yytext_ptr) = yy_bp; \
+ ncsa_leng = (size_t) (yy_cp - yy_bp); \
+ (yy_hold_char) = *yy_cp; \
+ *yy_cp = '\0'; \
+ (yy_c_buf_p) = yy_cp;
#define YY_NUM_RULES 14
#define YY_END_OF_BUFFER 15
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
- {
- flex_int32_t yy_verify;
- flex_int32_t yy_nxt;
- };
+ {
+ flex_int32_t yy_verify;
+ flex_int32_t yy_nxt;
+ };
static yyconst flex_int16_t yy_accept[76] =
{ 0,
11, 11, 0, 0, 5, 5, 15, 13, 12, 12,
@@ -688,33 +688,33 @@ static int input (void );
*/
#ifndef YY_INPUT
#define YY_INPUT(buf,result,max_size) \
- if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
- { \
- int c = '*'; \
- size_t n; \
- for ( n = 0; n < max_size && \
- (c = getc( ncsa_in )) != EOF && c != '\n'; ++n ) \
- buf[n] = (char) c; \
- if ( c == '\n' ) \
- buf[n++] = (char) c; \
- if ( c == EOF && ferror( ncsa_in ) ) \
- YY_FATAL_ERROR( "input in flex scanner failed" ); \
- result = n; \
- } \
- else \
- { \
- errno=0; \
- while ( (result = fread(buf, 1, max_size, ncsa_in))==0 && ferror(ncsa_in)) \
- { \
- if( errno != EINTR) \
- { \
- YY_FATAL_ERROR( "input in flex scanner failed" ); \
- break; \
- } \
- errno=0; \
- clearerr(ncsa_in); \
- } \
- }\
+ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+ { \
+ int c = '*'; \
+ size_t n; \
+ for ( n = 0; n < max_size && \
+ (c = getc( ncsa_in )) != EOF && c != '\n'; ++n ) \
+ buf[n] = (char) c; \
+ if ( c == '\n' ) \
+ buf[n++] = (char) c; \
+ if ( c == EOF && ferror( ncsa_in ) ) \
+ YY_FATAL_ERROR( "input in flex scanner failed" ); \
+ result = n; \
+ } \
+ else \
+ { \
+ errno=0; \
+ while ( (result = fread(buf, 1, max_size, ncsa_in))==0 && ferror(ncsa_in)) \
+ { \
+ if( errno != EINTR) \
+ { \
+ YY_FATAL_ERROR( "input in flex scanner failed" ); \
+ break; \
+ } \
+ errno=0; \
+ clearerr(ncsa_in); \
+ } \
+ }\
\
#endif
@@ -763,574 +763,574 @@ extern int ncsa_lex (void);
#endif
#define YY_RULE_SETUP \
- YY_USER_ACTION
+ YY_USER_ACTION
/** The main scanner function which does all the work.
*/
YY_DECL
{
- register yy_state_type yy_current_state;
- register char *yy_cp, *yy_bp;
- register int yy_act;
+ register yy_state_type yy_current_state;
+ register char *yy_cp, *yy_bp;
+ register int yy_act;
#line 45 "imap_ncsa.l"
#line 780 "<stdout>"
- if ( !(yy_init) )
- {
- (yy_init) = 1;
+ if ( !(yy_init) )
+ {
+ (yy_init) = 1;
#ifdef YY_USER_INIT
- YY_USER_INIT;
+ YY_USER_INIT;
#endif
- if ( ! (yy_start) )
- (yy_start) = 1; /* first start state */
+ if ( ! (yy_start) )
+ (yy_start) = 1; /* first start state */
- if ( ! ncsa_in )
- ncsa_in = stdin;
+ if ( ! ncsa_in )
+ ncsa_in = stdin;
- if ( ! ncsa_out )
- ncsa_out = stdout;
+ if ( ! ncsa_out )
+ ncsa_out = stdout;
- if ( ! YY_CURRENT_BUFFER ) {
- ncsa_ensure_buffer_stack ();
- YY_CURRENT_BUFFER_LVALUE =
- ncsa__create_buffer(ncsa_in,YY_BUF_SIZE );
- }
+ if ( ! YY_CURRENT_BUFFER ) {
+ ncsa_ensure_buffer_stack ();
+ YY_CURRENT_BUFFER_LVALUE =
+ ncsa__create_buffer(ncsa_in,YY_BUF_SIZE );
+ }
- ncsa__load_buffer_state( );
- }
+ ncsa__load_buffer_state( );
+ }
- while ( 1 ) /* loops until end-of-file is reached */
- {
- yy_cp = (yy_c_buf_p);
+ while ( 1 ) /* loops until end-of-file is reached */
+ {
+ yy_cp = (yy_c_buf_p);
- /* Support of ncsa_text. */
- *yy_cp = (yy_hold_char);
+ /* Support of ncsa_text. */
+ *yy_cp = (yy_hold_char);
- /* yy_bp points to the position in yy_ch_buf of the start of
- * the current run.
- */
- yy_bp = yy_cp;
+ /* yy_bp points to the position in yy_ch_buf of the start of
+ * the current run.
+ */
+ yy_bp = yy_cp;
- yy_current_state = (yy_start);
+ yy_current_state = (yy_start);
yy_match:
- do
- {
- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
- if ( yy_accept[yy_current_state] )
- {
- (yy_last_accepting_state) = yy_current_state;
- (yy_last_accepting_cpos) = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 76 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- ++yy_cp;
- }
- while ( yy_base[yy_current_state] != 178 );
+ do
+ {
+ register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+ if ( yy_accept[yy_current_state] )
+ {
+ (yy_last_accepting_state) = yy_current_state;
+ (yy_last_accepting_cpos) = yy_cp;
+ }
+ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ {
+ yy_current_state = (int) yy_def[yy_current_state];
+ if ( yy_current_state >= 76 )
+ yy_c = yy_meta[(unsigned int) yy_c];
+ }
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ ++yy_cp;
+ }
+ while ( yy_base[yy_current_state] != 178 );
yy_find_action:
- yy_act = yy_accept[yy_current_state];
- if ( yy_act == 0 )
- { /* have to back up */
- yy_cp = (yy_last_accepting_cpos);
- yy_current_state = (yy_last_accepting_state);
- yy_act = yy_accept[yy_current_state];
- }
-
- YY_DO_BEFORE_ACTION;
-
-do_action: /* This label is used only to access EOF actions. */
-
- switch ( yy_act )
- { /* beginning of action switch */
- case 0: /* must back up */
- /* undo the effects of YY_DO_BEFORE_ACTION */
- *yy_cp = (yy_hold_char);
- yy_cp = (yy_last_accepting_cpos);
- yy_current_state = (yy_last_accepting_state);
- goto yy_find_action;
+ yy_act = yy_accept[yy_current_state];
+ if ( yy_act == 0 )
+ { /* have to back up */
+ yy_cp = (yy_last_accepting_cpos);
+ yy_current_state = (yy_last_accepting_state);
+ yy_act = yy_accept[yy_current_state];
+ }
+
+ YY_DO_BEFORE_ACTION;
+
+do_action: /* This label is used only to access EOF actions. */
+
+ switch ( yy_act )
+ { /* beginning of action switch */
+ case 0: /* must back up */
+ /* undo the effects of YY_DO_BEFORE_ACTION */
+ *yy_cp = (yy_hold_char);
+ yy_cp = (yy_last_accepting_cpos);
+ yy_current_state = (yy_last_accepting_state);
+ goto yy_find_action;
case 1:
YY_RULE_SETUP
#line 47 "imap_ncsa.l"
{
- BEGIN(comment);
- return AUTHOR;
- }
- YY_BREAK
+ BEGIN(comment);
+ return AUTHOR;
+ }
+ YY_BREAK
case 2:
YY_RULE_SETUP
#line 52 "imap_ncsa.l"
{
- BEGIN(comment);
- return TITLE;
- }
- YY_BREAK
+ BEGIN(comment);
+ return TITLE;
+ }
+ YY_BREAK
case 3:
YY_RULE_SETUP
#line 57 "imap_ncsa.l"
{
- BEGIN(comment);
- return DESCRIPTION;
- }
- YY_BREAK
+ BEGIN(comment);
+ return DESCRIPTION;
+ }
+ YY_BREAK
case 4:
YY_RULE_SETUP
#line 62 "imap_ncsa.l"
{
- BEGIN(comment);
- return BEGIN_COMMENT;
- }
- YY_BREAK
+ BEGIN(comment);
+ return BEGIN_COMMENT;
+ }
+ YY_BREAK
case 5:
YY_RULE_SETUP
#line 67 "imap_ncsa.l"
{
- BEGIN(INITIAL);
- ncsa_lval.id = g_strndup (ncsa_text, ncsa_leng);
- return COMMENT;
- }
- YY_BREAK
+ BEGIN(INITIAL);
+ ncsa_lval.id = g_strndup (ncsa_text, ncsa_leng);
+ return COMMENT;
+ }
+ YY_BREAK
case 6:
YY_RULE_SETUP
#line 73 "imap_ncsa.l"
{
- BEGIN(imap_link);
- return RECTANGLE;
- }
- YY_BREAK
+ BEGIN(imap_link);
+ return RECTANGLE;
+ }
+ YY_BREAK
case 7:
YY_RULE_SETUP
#line 78 "imap_ncsa.l"
{
- BEGIN(imap_link);
- return CIRCLE;
- }
- YY_BREAK
+ BEGIN(imap_link);
+ return CIRCLE;
+ }
+ YY_BREAK
case 8:
YY_RULE_SETUP
#line 83 "imap_ncsa.l"
{
- BEGIN(imap_link);
- return POLYGON;
- }
- YY_BREAK
+ BEGIN(imap_link);
+ return POLYGON;
+ }
+ YY_BREAK
case 9:
YY_RULE_SETUP
#line 88 "imap_ncsa.l"
{
- BEGIN(imap_link);
- return DEFAULT;
- }
- YY_BREAK
+ BEGIN(imap_link);
+ return DEFAULT;
+ }
+ YY_BREAK
case 10:
YY_RULE_SETUP
#line 93 "imap_ncsa.l"
{
- BEGIN(INITIAL);
- ncsa_lval.id = g_strndup (ncsa_text, ncsa_leng);
- return LINK;
- }
- YY_BREAK
+ BEGIN(INITIAL);
+ ncsa_lval.id = g_strndup (ncsa_text, ncsa_leng);
+ return LINK;
+ }
+ YY_BREAK
case 11:
YY_RULE_SETUP
#line 99 "imap_ncsa.l"
{
ncsa_lval.value = g_ascii_strtod (ncsa_text, NULL);
- return FLOAT;
- }
- YY_BREAK
+ return FLOAT;
+ }
+ YY_BREAK
case 12:
/* rule 12 can match eol */
YY_RULE_SETUP
#line 104 "imap_ncsa.l"
; /* Eat white space */
- YY_BREAK
+ YY_BREAK
case 13:
YY_RULE_SETUP
#line 106 "imap_ncsa.l"
return *ncsa_text;
- YY_BREAK
+ YY_BREAK
case 14:
YY_RULE_SETUP
#line 108 "imap_ncsa.l"
ECHO;
- YY_BREAK
+ YY_BREAK
#line 969 "<stdout>"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(imap_link):
case YY_STATE_EOF(comment):
- yyterminate();
-
- case YY_END_OF_BUFFER:
- {
- /* Amount of text matched not including the EOB char. */
- int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
-
- /* Undo the effects of YY_DO_BEFORE_ACTION. */
- *yy_cp = (yy_hold_char);
- YY_RESTORE_YY_MORE_OFFSET
-
- if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
- {
- /* We're scanning a new file or input source. It's
- * possible that this happened because the user
- * just pointed ncsa_in at a new source and called
- * ncsa_lex(). If so, then we have to assure
- * consistency between YY_CURRENT_BUFFER and our
- * globals. Here is the right place to do so, because
- * this is the first action (other than possibly a
- * back-up) that will match for the new input source.
- */
- (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
- YY_CURRENT_BUFFER_LVALUE->yy_input_file = ncsa_in;
- YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
- }
-
- /* Note that here we test for yy_c_buf_p "<=" to the position
- * of the first EOB in the buffer, since yy_c_buf_p will
- * already have been incremented past the NUL character
- * (since all states make transitions on EOB to the
- * end-of-buffer state). Contrast this with the test
- * in input().
- */
- if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
- { /* This was really a NUL. */
- yy_state_type yy_next_state;
-
- (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
-
- yy_current_state = yy_get_previous_state( );
-
- /* Okay, we're now positioned to make the NUL
- * transition. We couldn't have
- * yy_get_previous_state() go ahead and do it
- * for us because it doesn't know how to deal
- * with the possibility of jamming (and we don't
- * want to build jamming into it because then it
- * will run more slowly).
- */
-
- yy_next_state = yy_try_NUL_trans( yy_current_state );
-
- yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-
- if ( yy_next_state )
- {
- /* Consume the NUL. */
- yy_cp = ++(yy_c_buf_p);
- yy_current_state = yy_next_state;
- goto yy_match;
- }
-
- else
- {
- yy_cp = (yy_c_buf_p);
- goto yy_find_action;
- }
- }
-
- else switch ( yy_get_next_buffer( ) )
- {
- case EOB_ACT_END_OF_FILE:
- {
- (yy_did_buffer_switch_on_eof) = 0;
-
- if ( ncsa_wrap( ) )
- {
- /* Note: because we've taken care in
- * yy_get_next_buffer() to have set up
- * ncsa_text, we can now set up
- * yy_c_buf_p so that if some total
- * hoser (like flex itself) wants to
- * call the scanner after we return the
- * YY_NULL, it'll still work - another
- * YY_NULL will get returned.
- */
- (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
-
- yy_act = YY_STATE_EOF(YY_START);
- goto do_action;
- }
-
- else
- {
- if ( ! (yy_did_buffer_switch_on_eof) )
- YY_NEW_FILE;
- }
- break;
- }
-
- case EOB_ACT_CONTINUE_SCAN:
- (yy_c_buf_p) =
- (yytext_ptr) + yy_amount_of_matched_text;
-
- yy_current_state = yy_get_previous_state( );
-
- yy_cp = (yy_c_buf_p);
- yy_bp = (yytext_ptr) + YY_MORE_ADJ;
- goto yy_match;
-
- case EOB_ACT_LAST_MATCH:
- (yy_c_buf_p) =
- &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
-
- yy_current_state = yy_get_previous_state( );
-
- yy_cp = (yy_c_buf_p);
- yy_bp = (yytext_ptr) + YY_MORE_ADJ;
- goto yy_find_action;
- }
- break;
- }
-
- default:
- YY_FATAL_ERROR(
- "fatal flex scanner internal error--no action found" );
- } /* end of action switch */
- } /* end of scanning one token */
+ yyterminate();
+
+ case YY_END_OF_BUFFER:
+ {
+ /* Amount of text matched not including the EOB char. */
+ int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+ /* Undo the effects of YY_DO_BEFORE_ACTION. */
+ *yy_cp = (yy_hold_char);
+ YY_RESTORE_YY_MORE_OFFSET
+
+ if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+ {
+ /* We're scanning a new file or input source. It's
+ * possible that this happened because the user
+ * just pointed ncsa_in at a new source and called
+ * ncsa_lex(). If so, then we have to assure
+ * consistency between YY_CURRENT_BUFFER and our
+ * globals. Here is the right place to do so, because
+ * this is the first action (other than possibly a
+ * back-up) that will match for the new input source.
+ */
+ (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+ YY_CURRENT_BUFFER_LVALUE->yy_input_file = ncsa_in;
+ YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+ }
+
+ /* Note that here we test for yy_c_buf_p "<=" to the position
+ * of the first EOB in the buffer, since yy_c_buf_p will
+ * already have been incremented past the NUL character
+ * (since all states make transitions on EOB to the
+ * end-of-buffer state). Contrast this with the test
+ * in input().
+ */
+ if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+ { /* This was really a NUL. */
+ yy_state_type yy_next_state;
+
+ (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+ yy_current_state = yy_get_previous_state( );
+
+ /* Okay, we're now positioned to make the NUL
+ * transition. We couldn't have
+ * yy_get_previous_state() go ahead and do it
+ * for us because it doesn't know how to deal
+ * with the possibility of jamming (and we don't
+ * want to build jamming into it because then it
+ * will run more slowly).
+ */
+
+ yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+ yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+ if ( yy_next_state )
+ {
+ /* Consume the NUL. */
+ yy_cp = ++(yy_c_buf_p);
+ yy_current_state = yy_next_state;
+ goto yy_match;
+ }
+
+ else
+ {
+ yy_cp = (yy_c_buf_p);
+ goto yy_find_action;
+ }
+ }
+
+ else switch ( yy_get_next_buffer( ) )
+ {
+ case EOB_ACT_END_OF_FILE:
+ {
+ (yy_did_buffer_switch_on_eof) = 0;
+
+ if ( ncsa_wrap( ) )
+ {
+ /* Note: because we've taken care in
+ * yy_get_next_buffer() to have set up
+ * ncsa_text, we can now set up
+ * yy_c_buf_p so that if some total
+ * hoser (like flex itself) wants to
+ * call the scanner after we return the
+ * YY_NULL, it'll still work - another
+ * YY_NULL will get returned.
+ */
+ (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+ yy_act = YY_STATE_EOF(YY_START);
+ goto do_action;
+ }
+
+ else
+ {
+ if ( ! (yy_did_buffer_switch_on_eof) )
+ YY_NEW_FILE;
+ }
+ break;
+ }
+
+ case EOB_ACT_CONTINUE_SCAN:
+ (yy_c_buf_p) =
+ (yytext_ptr) + yy_amount_of_matched_text;
+
+ yy_current_state = yy_get_previous_state( );
+
+ yy_cp = (yy_c_buf_p);
+ yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+ goto yy_match;
+
+ case EOB_ACT_LAST_MATCH:
+ (yy_c_buf_p) =
+ &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+ yy_current_state = yy_get_previous_state( );
+
+ yy_cp = (yy_c_buf_p);
+ yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+ goto yy_find_action;
+ }
+ break;
+ }
+
+ default:
+ YY_FATAL_ERROR(
+ "fatal flex scanner internal error--no action found" );
+ } /* end of action switch */
+ } /* end of scanning one token */
} /* end of ncsa_lex */
/* yy_get_next_buffer - try to read in a new buffer
*
* Returns a code representing an action:
- * EOB_ACT_LAST_MATCH -
- * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- * EOB_ACT_END_OF_FILE - end of file
+ * EOB_ACT_LAST_MATCH -
+ * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ * EOB_ACT_END_OF_FILE - end of file
*/
static int yy_get_next_buffer (void)
{
- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
- register char *source = (yytext_ptr);
- register int number_to_move, i;
- int ret_val;
-
- if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
- YY_FATAL_ERROR(
- "fatal flex scanner internal error--end of buffer missed" );
-
- if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
- { /* Don't try to fill the buffer, so this is an EOF. */
- if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
- {
- /* We matched a single character, the EOB, so
- * treat this as a final EOF.
- */
- return EOB_ACT_END_OF_FILE;
- }
-
- else
- {
- /* We matched some text prior to the EOB, first
- * process it.
- */
- return EOB_ACT_LAST_MATCH;
- }
- }
-
- /* Try to read more data. */
-
- /* First move last chars to start of buffer. */
- number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
-
- for ( i = 0; i < number_to_move; ++i )
- *(dest++) = *(source++);
-
- if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
- /* don't do the read, it's not guaranteed to return an EOF,
- * just force an EOF
- */
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
-
- else
- {
- int num_to_read =
- YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-
- while ( num_to_read <= 0 )
- { /* Not enough room in the buffer - grow it. */
-
- /* just a shorter name for the current buffer */
- YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
-
- int yy_c_buf_p_offset =
- (int) ((yy_c_buf_p) - b->yy_ch_buf);
-
- if ( b->yy_is_our_buffer )
- {
- int new_size = b->yy_buf_size * 2;
-
- if ( new_size <= 0 )
- b->yy_buf_size += b->yy_buf_size / 8;
- else
- b->yy_buf_size *= 2;
-
- b->yy_ch_buf = (char *)
- /* Include room in for 2 EOB chars. */
- ncsa_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 );
- }
- else
- /* Can't grow it, we don't own it. */
- b->yy_ch_buf = 0;
-
- if ( ! b->yy_ch_buf )
- YY_FATAL_ERROR(
- "fatal error - scanner input buffer overflow" );
-
- (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
-
- num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
- number_to_move - 1;
-
- }
-
- if ( num_to_read > YY_READ_BUF_SIZE )
- num_to_read = YY_READ_BUF_SIZE;
-
- /* Read in more data. */
- YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- (yy_n_chars), (size_t) num_to_read );
-
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
- }
-
- if ( (yy_n_chars) == 0 )
- {
- if ( number_to_move == YY_MORE_ADJ )
- {
- ret_val = EOB_ACT_END_OF_FILE;
- ncsa_restart(ncsa_in );
- }
-
- else
- {
- ret_val = EOB_ACT_LAST_MATCH;
- YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
- YY_BUFFER_EOF_PENDING;
- }
- }
-
- else
- ret_val = EOB_ACT_CONTINUE_SCAN;
-
- if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
- /* Extend the array by 50%, plus the number we really need. */
- yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) ncsa_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size );
- if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
- YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
- }
-
- (yy_n_chars) += number_to_move;
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
-
- (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+ register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+ register char *source = (yytext_ptr);
+ register int number_to_move, i;
+ int ret_val;
+
+ if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+ YY_FATAL_ERROR(
+ "fatal flex scanner internal error--end of buffer missed" );
+
+ if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+ { /* Don't try to fill the buffer, so this is an EOF. */
+ if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+ {
+ /* We matched a single character, the EOB, so
+ * treat this as a final EOF.
+ */
+ return EOB_ACT_END_OF_FILE;
+ }
+
+ else
+ {
+ /* We matched some text prior to the EOB, first
+ * process it.
+ */
+ return EOB_ACT_LAST_MATCH;
+ }
+ }
+
+ /* Try to read more data. */
+
+ /* First move last chars to start of buffer. */
+ number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+ for ( i = 0; i < number_to_move; ++i )
+ *(dest++) = *(source++);
+
+ if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+ /* don't do the read, it's not guaranteed to return an EOF,
+ * just force an EOF
+ */
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+ else
+ {
+ int num_to_read =
+ YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+ while ( num_to_read <= 0 )
+ { /* Not enough room in the buffer - grow it. */
+
+ /* just a shorter name for the current buffer */
+ YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+ int yy_c_buf_p_offset =
+ (int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+ if ( b->yy_is_our_buffer )
+ {
+ int new_size = b->yy_buf_size * 2;
+
+ if ( new_size <= 0 )
+ b->yy_buf_size += b->yy_buf_size / 8;
+ else
+ b->yy_buf_size *= 2;
+
+ b->yy_ch_buf = (char *)
+ /* Include room in for 2 EOB chars. */
+ ncsa_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 );
+ }
+ else
+ /* Can't grow it, we don't own it. */
+ b->yy_ch_buf = 0;
+
+ if ( ! b->yy_ch_buf )
+ YY_FATAL_ERROR(
+ "fatal error - scanner input buffer overflow" );
+
+ (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+ num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+ number_to_move - 1;
+
+ }
+
+ if ( num_to_read > YY_READ_BUF_SIZE )
+ num_to_read = YY_READ_BUF_SIZE;
+
+ /* Read in more data. */
+ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+ (yy_n_chars), (size_t) num_to_read );
+
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+ }
+
+ if ( (yy_n_chars) == 0 )
+ {
+ if ( number_to_move == YY_MORE_ADJ )
+ {
+ ret_val = EOB_ACT_END_OF_FILE;
+ ncsa_restart(ncsa_in );
+ }
+
+ else
+ {
+ ret_val = EOB_ACT_LAST_MATCH;
+ YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+ YY_BUFFER_EOF_PENDING;
+ }
+ }
+
+ else
+ ret_val = EOB_ACT_CONTINUE_SCAN;
+
+ if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+ /* Extend the array by 50%, plus the number we really need. */
+ yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+ YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) ncsa_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size );
+ if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+ YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+ }
+
+ (yy_n_chars) += number_to_move;
+ YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+ YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+ (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
- return ret_val;
+ return ret_val;
}
/* yy_get_previous_state - get the state just before the EOB char was reached */
static yy_state_type yy_get_previous_state (void)
{
- register yy_state_type yy_current_state;
- register char *yy_cp;
+ register yy_state_type yy_current_state;
+ register char *yy_cp;
- yy_current_state = (yy_start);
-
- for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
- {
- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
- if ( yy_accept[yy_current_state] )
- {
- (yy_last_accepting_state) = yy_current_state;
- (yy_last_accepting_cpos) = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 76 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- }
-
- return yy_current_state;
+ yy_current_state = (yy_start);
+
+ for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+ {
+ register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ if ( yy_accept[yy_current_state] )
+ {
+ (yy_last_accepting_state) = yy_current_state;
+ (yy_last_accepting_cpos) = yy_cp;
+ }
+ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ {
+ yy_current_state = (int) yy_def[yy_current_state];
+ if ( yy_current_state >= 76 )
+ yy_c = yy_meta[(unsigned int) yy_c];
+ }
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ }
+
+ return yy_current_state;
}
/* yy_try_NUL_trans - try to make a transition on the NUL character
*
* synopsis
- * next_state = yy_try_NUL_trans( current_state );
+ * next_state = yy_try_NUL_trans( current_state );
*/
static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
{
- register int yy_is_jam;
- register char *yy_cp = (yy_c_buf_p);
-
- register YY_CHAR yy_c = 1;
- if ( yy_accept[yy_current_state] )
- {
- (yy_last_accepting_state) = yy_current_state;
- (yy_last_accepting_cpos) = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 76 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- yy_is_jam = (yy_current_state == 75);
-
- return yy_is_jam ? 0 : yy_current_state;
+ register int yy_is_jam;
+ register char *yy_cp = (yy_c_buf_p);
+
+ register YY_CHAR yy_c = 1;
+ if ( yy_accept[yy_current_state] )
+ {
+ (yy_last_accepting_state) = yy_current_state;
+ (yy_last_accepting_cpos) = yy_cp;
+ }
+ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+ {
+ yy_current_state = (int) yy_def[yy_current_state];
+ if ( yy_current_state >= 76 )
+ yy_c = yy_meta[(unsigned int) yy_c];
+ }
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ yy_is_jam = (yy_current_state == 75);
+
+ return yy_is_jam ? 0 : yy_current_state;
}
static void yyunput (int c, register char * yy_bp )
{
- register char *yy_cp;
+ register char *yy_cp;
yy_cp = (yy_c_buf_p);
- /* undo effects of setting up ncsa_text */
- *yy_cp = (yy_hold_char);
+ /* undo effects of setting up ncsa_text */
+ *yy_cp = (yy_hold_char);
- if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
- { /* need to shift things up to make room */
- /* +2 for EOB chars. */
- register int number_to_move = (yy_n_chars) + 2;
- register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
- YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
- register char *source =
- &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+ if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+ { /* need to shift things up to make room */
+ /* +2 for EOB chars. */
+ register int number_to_move = (yy_n_chars) + 2;
+ register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+ register char *source =
+ &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
- while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
- *--dest = *--source;
+ while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+ *--dest = *--source;
- yy_cp += (int) (dest - source);
- yy_bp += (int) (dest - source);
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
- (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+ yy_cp += (int) (dest - source);
+ yy_bp += (int) (dest - source);
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+ (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
- if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
- YY_FATAL_ERROR( "flex scanner push-back overflow" );
- }
+ if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+ YY_FATAL_ERROR( "flex scanner push-back overflow" );
+ }
- *--yy_cp = (char) c;
+ *--yy_cp = (char) c;
- (yytext_ptr) = yy_bp;
- (yy_hold_char) = *yy_cp;
- (yy_c_buf_p) = yy_cp;
+ (yytext_ptr) = yy_bp;
+ (yy_hold_char) = *yy_cp;
+ (yy_c_buf_p) = yy_cp;
}
#ifndef YY_NO_INPUT
@@ -1341,71 +1341,71 @@ static int yy_get_next_buffer (void)
#endif
{
- int c;
+ int c;
- *(yy_c_buf_p) = (yy_hold_char);
-
- if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
- {
- /* yy_c_buf_p now points to the character we want to return.
- * If this occurs *before* the EOB characters, then it's a
- * valid NUL; if not, then we've hit the end of the buffer.
- */
- if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
- /* This was really a NUL. */
- *(yy_c_buf_p) = '\0';
-
- else
- { /* need more input */
- int offset = (yy_c_buf_p) - (yytext_ptr);
- ++(yy_c_buf_p);
-
- switch ( yy_get_next_buffer( ) )
- {
- case EOB_ACT_LAST_MATCH:
- /* This happens because yy_g_n_b()
- * sees that we've accumulated a
- * token and flags that we need to
- * try matching the token before
- * proceeding. But for input(),
- * there's no matching to consider.
- * So convert the EOB_ACT_LAST_MATCH
- * to EOB_ACT_END_OF_FILE.
- */
-
- /* Reset buffer status. */
- ncsa_restart(ncsa_in );
-
- /*FALLTHROUGH*/
-
- case EOB_ACT_END_OF_FILE:
- {
- if ( ncsa_wrap( ) )
- return EOF;
-
- if ( ! (yy_did_buffer_switch_on_eof) )
- YY_NEW_FILE;
+ *(yy_c_buf_p) = (yy_hold_char);
+
+ if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+ {
+ /* yy_c_buf_p now points to the character we want to return.
+ * If this occurs *before* the EOB characters, then it's a
+ * valid NUL; if not, then we've hit the end of the buffer.
+ */
+ if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+ /* This was really a NUL. */
+ *(yy_c_buf_p) = '\0';
+
+ else
+ { /* need more input */
+ int offset = (yy_c_buf_p) - (yytext_ptr);
+ ++(yy_c_buf_p);
+
+ switch ( yy_get_next_buffer( ) )
+ {
+ case EOB_ACT_LAST_MATCH:
+ /* This happens because yy_g_n_b()
+ * sees that we've accumulated a
+ * token and flags that we need to
+ * try matching the token before
+ * proceeding. But for input(),
+ * there's no matching to consider.
+ * So convert the EOB_ACT_LAST_MATCH
+ * to EOB_ACT_END_OF_FILE.
+ */
+
+ /* Reset buffer status. */
+ ncsa_restart(ncsa_in );
+
+ /*FALLTHROUGH*/
+
+ case EOB_ACT_END_OF_FILE:
+ {
+ if ( ncsa_wrap( ) )
+ return EOF;
+
+ if ( ! (yy_did_buffer_switch_on_eof) )
+ YY_NEW_FILE;
#ifdef __cplusplus
- return yyinput();
+ return yyinput();
#else
- return input();
+ return input();
#endif
- }
+ }
- case EOB_ACT_CONTINUE_SCAN:
- (yy_c_buf_p) = (yytext_ptr) + offset;
- break;
- }
- }
- }
+ case EOB_ACT_CONTINUE_SCAN:
+ (yy_c_buf_p) = (yytext_ptr) + offset;
+ break;
+ }
+ }
+ }
- c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */
- *(yy_c_buf_p) = '\0'; /* preserve ncsa_text */
- (yy_hold_char) = *++(yy_c_buf_p);
+ c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */
+ *(yy_c_buf_p) = '\0'; /* preserve ncsa_text */
+ (yy_hold_char) = *++(yy_c_buf_p);
- return c;
+ return c;
}
-#endif /* ifndef YY_NO_INPUT */
+#endif /* ifndef YY_NO_INPUT */
/** Immediately switch to a different input stream.
* @param input_file A readable stream.
@@ -1415,14 +1415,14 @@ static int yy_get_next_buffer (void)
void ncsa_restart (FILE * input_file )
{
- if ( ! YY_CURRENT_BUFFER ){
+ if ( ! YY_CURRENT_BUFFER ){
ncsa_ensure_buffer_stack ();
- YY_CURRENT_BUFFER_LVALUE =
+ YY_CURRENT_BUFFER_LVALUE =
ncsa__create_buffer(ncsa_in,YY_BUF_SIZE );
- }
+ }
- ncsa__init_buffer(YY_CURRENT_BUFFER,input_file );
- ncsa__load_buffer_state( );
+ ncsa__init_buffer(YY_CURRENT_BUFFER,input_file );
+ ncsa__load_buffer_state( );
}
/** Switch to a different input buffer.
@@ -1432,40 +1432,40 @@ static int yy_get_next_buffer (void)
void ncsa__switch_to_buffer (YY_BUFFER_STATE new_buffer )
{
- /* TODO. We should be able to replace this entire function body
- * with
- * ncsa_pop_buffer_state();
- * ncsa_push_buffer_state(new_buffer);
+ /* TODO. We should be able to replace this entire function body
+ * with
+ * ncsa_pop_buffer_state();
+ * ncsa_push_buffer_state(new_buffer);
*/
- ncsa_ensure_buffer_stack ();
- if ( YY_CURRENT_BUFFER == new_buffer )
- return;
-
- if ( YY_CURRENT_BUFFER )
- {
- /* Flush out information for old buffer. */
- *(yy_c_buf_p) = (yy_hold_char);
- YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
- }
-
- YY_CURRENT_BUFFER_LVALUE = new_buffer;
- ncsa__load_buffer_state( );
-
- /* We don't actually know whether we did this switch during
- * EOF (ncsa_wrap()) processing, but the only time this flag
- * is looked at is after ncsa_wrap() is called, so it's safe
- * to go ahead and always set it.
- */
- (yy_did_buffer_switch_on_eof) = 1;
+ ncsa_ensure_buffer_stack ();
+ if ( YY_CURRENT_BUFFER == new_buffer )
+ return;
+
+ if ( YY_CURRENT_BUFFER )
+ {
+ /* Flush out information for old buffer. */
+ *(yy_c_buf_p) = (yy_hold_char);
+ YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+ }
+
+ YY_CURRENT_BUFFER_LVALUE = new_buffer;
+ ncsa__load_buffer_state( );
+
+ /* We don't actually know whether we did this switch during
+ * EOF (ncsa_wrap()) processing, but the only time this flag
+ * is looked at is after ncsa_wrap() is called, so it's safe
+ * to go ahead and always set it.
+ */
+ (yy_did_buffer_switch_on_eof) = 1;
}
static void ncsa__load_buffer_state (void)
{
- (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
- (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
- ncsa_in = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
- (yy_hold_char) = *(yy_c_buf_p);
+ (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+ (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+ ncsa_in = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+ (yy_hold_char) = *(yy_c_buf_p);
}
/** Allocate and initialize an input buffer state.
@@ -1476,26 +1476,26 @@ static void ncsa__load_buffer_state (void)
*/
YY_BUFFER_STATE ncsa__create_buffer (FILE * file, int size )
{
- YY_BUFFER_STATE b;
+ YY_BUFFER_STATE b;
- b = (YY_BUFFER_STATE) ncsa_alloc(sizeof( struct yy_buffer_state ) );
- if ( ! b )
- YY_FATAL_ERROR( "out of dynamic memory in ncsa__create_buffer()" );
+ b = (YY_BUFFER_STATE) ncsa_alloc(sizeof( struct yy_buffer_state ) );
+ if ( ! b )
+ YY_FATAL_ERROR( "out of dynamic memory in ncsa__create_buffer()" );
- b->yy_buf_size = size;
+ b->yy_buf_size = size;
- /* yy_ch_buf has to be 2 characters longer than the size given because
- * we need to put in 2 end-of-buffer characters.
- */
- b->yy_ch_buf = (char *) ncsa_alloc(b->yy_buf_size + 2 );
- if ( ! b->yy_ch_buf )
- YY_FATAL_ERROR( "out of dynamic memory in ncsa__create_buffer()" );
+ /* yy_ch_buf has to be 2 characters longer than the size given because
+ * we need to put in 2 end-of-buffer characters.
+ */
+ b->yy_ch_buf = (char *) ncsa_alloc(b->yy_buf_size + 2 );
+ if ( ! b->yy_ch_buf )
+ YY_FATAL_ERROR( "out of dynamic memory in ncsa__create_buffer()" );
- b->yy_is_our_buffer = 1;
+ b->yy_is_our_buffer = 1;
- ncsa__init_buffer(b,file );
+ ncsa__init_buffer(b,file );
- return b;
+ return b;
}
/** Destroy the buffer.
@@ -1505,16 +1505,16 @@ static void ncsa__load_buffer_state (void)
void ncsa__delete_buffer (YY_BUFFER_STATE b )
{
- if ( ! b )
- return;
+ if ( ! b )
+ return;
- if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
- YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+ if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+ YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
- if ( b->yy_is_our_buffer )
- ncsa_free((void *) b->yy_ch_buf );
+ if ( b->yy_is_our_buffer )
+ ncsa_free((void *) b->yy_ch_buf );
- ncsa_free((void *) b );
+ ncsa_free((void *) b );
}
#ifndef __cplusplus
@@ -1528,12 +1528,12 @@ extern int isatty (int );
static void ncsa__init_buffer (YY_BUFFER_STATE b, FILE * file )
{
- int oerrno = errno;
+ int oerrno = errno;
- ncsa__flush_buffer(b );
+ ncsa__flush_buffer(b );
- b->yy_input_file = file;
- b->yy_fill_buffer = 1;
+ b->yy_input_file = file;
+ b->yy_fill_buffer = 1;
/* If b is the current buffer, then ncsa__init_buffer was _probably_
* called from ncsa_restart() or through yy_get_next_buffer.
@@ -1546,7 +1546,7 @@ extern int isatty (int );
b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
- errno = oerrno;
+ errno = oerrno;
}
/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
@@ -1555,25 +1555,25 @@ extern int isatty (int );
*/
void ncsa__flush_buffer (YY_BUFFER_STATE b )
{
- if ( ! b )
- return;
+ if ( ! b )
+ return;
- b->yy_n_chars = 0;
+ b->yy_n_chars = 0;
- /* We always need two end-of-buffer characters. The first causes
- * a transition to the end-of-buffer state. The second causes
- * a jam in that state.
- */
- b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
- b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+ /* We always need two end-of-buffer characters. The first causes
+ * a transition to the end-of-buffer state. The second causes
+ * a jam in that state.
+ */
+ b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+ b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
- b->yy_buf_pos = &b->yy_ch_buf[0];
+ b->yy_buf_pos = &b->yy_ch_buf[0];
- b->yy_at_bol = 1;
- b->yy_buffer_status = YY_BUFFER_NEW;
+ b->yy_at_bol = 1;
+ b->yy_buffer_status = YY_BUFFER_NEW;
- if ( b == YY_CURRENT_BUFFER )
- ncsa__load_buffer_state( );
+ if ( b == YY_CURRENT_BUFFER )
+ ncsa__load_buffer_state( );
}
/** Pushes the new state onto the stack. The new state becomes
@@ -1584,28 +1584,28 @@ extern int isatty (int );
*/
void ncsa_push_buffer_state (YY_BUFFER_STATE new_buffer )
{
- if (new_buffer == NULL)
- return;
-
- ncsa_ensure_buffer_stack();
-
- /* This block is copied from ncsa__switch_to_buffer. */
- if ( YY_CURRENT_BUFFER )
- {
- /* Flush out information for old buffer. */
- *(yy_c_buf_p) = (yy_hold_char);
- YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
- }
-
- /* Only push if top exists. Otherwise, replace top. */
- if (YY_CURRENT_BUFFER)
- (yy_buffer_stack_top)++;
- YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
- /* copied from ncsa__switch_to_buffer. */
- ncsa__load_buffer_state( );
- (yy_did_buffer_switch_on_eof) = 1;
+ if (new_buffer == NULL)
+ return;
+
+ ncsa_ensure_buffer_stack();
+
+ /* This block is copied from ncsa__switch_to_buffer. */
+ if ( YY_CURRENT_BUFFER )
+ {
+ /* Flush out information for old buffer. */
+ *(yy_c_buf_p) = (yy_hold_char);
+ YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+ YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+ }
+
+ /* Only push if top exists. Otherwise, replace top. */
+ if (YY_CURRENT_BUFFER)
+ (yy_buffer_stack_top)++;
+ YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+ /* copied from ncsa__switch_to_buffer. */
+ ncsa__load_buffer_state( );
+ (yy_did_buffer_switch_on_eof) = 1;
}
/** Removes and deletes the top of the stack, if present.
@@ -1614,18 +1614,18 @@ void ncsa_push_buffer_state (YY_BUFFER_STATE new_buffer )
*/
void ncsa_pop_buffer_state (void)
{
- if (!YY_CURRENT_BUFFER)
- return;
-
- ncsa__delete_buffer(YY_CURRENT_BUFFER );
- YY_CURRENT_BUFFER_LVALUE = NULL;
- if ((yy_buffer_stack_top) > 0)
- --(yy_buffer_stack_top);
-
- if (YY_CURRENT_BUFFER) {
- ncsa__load_buffer_state( );
- (yy_did_buffer_switch_on_eof) = 1;
- }
+ if (!YY_CURRENT_BUFFER)
+ return;
+
+ ncsa__delete_buffer(YY_CURRENT_BUFFER );
+ YY_CURRENT_BUFFER_LVALUE = NULL;
+ if ((yy_buffer_stack_top) > 0)
+ --(yy_buffer_stack_top);
+
+ if (YY_CURRENT_BUFFER) {
+ ncsa__load_buffer_state( );
+ (yy_did_buffer_switch_on_eof) = 1;
+ }
}
/* Allocates the stack if it does not exist.
@@ -1633,45 +1633,45 @@ void ncsa_pop_buffer_state (void)
*/
static void ncsa_ensure_buffer_stack (void)
{
- int num_to_alloc;
+ int num_to_alloc;
- if (!(yy_buffer_stack)) {
+ if (!(yy_buffer_stack)) {
- /* First allocation is just for 2 elements, since we don't know if this
- * scanner will even need a stack. We use 2 instead of 1 to avoid an
- * immediate realloc on the next call.
+ /* First allocation is just for 2 elements, since we don't know if this
+ * scanner will even need a stack. We use 2 instead of 1 to avoid an
+ * immediate realloc on the next call.
*/
- num_to_alloc = 1;
- (yy_buffer_stack) = (struct yy_buffer_state**)ncsa_alloc
- (num_to_alloc * sizeof(struct yy_buffer_state*)
- );
- if ( ! (yy_buffer_stack) )
- YY_FATAL_ERROR( "out of dynamic memory in ncsa_ensure_buffer_stack()" );
-
- memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-
- (yy_buffer_stack_max) = num_to_alloc;
- (yy_buffer_stack_top) = 0;
- return;
- }
-
- if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
- /* Increase the buffer to prepare for a possible push. */
- int grow_size = 8 /* arbitrary grow size */;
-
- num_to_alloc = (yy_buffer_stack_max) + grow_size;
- (yy_buffer_stack) = (struct yy_buffer_state**)ncsa_realloc
- ((yy_buffer_stack),
- num_to_alloc * sizeof(struct yy_buffer_state*)
- );
- if ( ! (yy_buffer_stack) )
- YY_FATAL_ERROR( "out of dynamic memory in ncsa_ensure_buffer_stack()" );
-
- /* zero only the new slots.*/
- memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
- (yy_buffer_stack_max) = num_to_alloc;
- }
+ num_to_alloc = 1;
+ (yy_buffer_stack) = (struct yy_buffer_state**)ncsa_alloc
+ (num_to_alloc * sizeof(struct yy_buffer_state*)
+ );
+ if ( ! (yy_buffer_stack) )
+ YY_FATAL_ERROR( "out of dynamic memory in ncsa_ensure_buffer_stack()" );
+
+ memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+
+ (yy_buffer_stack_max) = num_to_alloc;
+ (yy_buffer_stack_top) = 0;
+ return;
+ }
+
+ if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+ /* Increase the buffer to prepare for a possible push. */
+ int grow_size = 8 /* arbitrary grow size */;
+
+ num_to_alloc = (yy_buffer_stack_max) + grow_size;
+ (yy_buffer_stack) = (struct yy_buffer_state**)ncsa_realloc
+ ((yy_buffer_stack),
+ num_to_alloc * sizeof(struct yy_buffer_state*)
+ );
+ if ( ! (yy_buffer_stack) )
+ YY_FATAL_ERROR( "out of dynamic memory in ncsa_ensure_buffer_stack()" );
+
+ /* zero only the new slots.*/
+ memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+ (yy_buffer_stack_max) = num_to_alloc;
+ }
}
/** Setup the input buffer state to scan directly from a user-specified character buffer.
@@ -1682,31 +1682,31 @@ static void ncsa_ensure_buffer_stack (void)
*/
YY_BUFFER_STATE ncsa__scan_buffer (char * base, yy_size_t size )
{
- YY_BUFFER_STATE b;
+ YY_BUFFER_STATE b;
- if ( size < 2 ||
- base[size-2] != YY_END_OF_BUFFER_CHAR ||
- base[size-1] != YY_END_OF_BUFFER_CHAR )
- /* They forgot to leave room for the EOB's. */
- return 0;
-
- b = (YY_BUFFER_STATE) ncsa_alloc(sizeof( struct yy_buffer_state ) );
- if ( ! b )
- YY_FATAL_ERROR( "out of dynamic memory in ncsa__scan_buffer()" );
-
- b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
- b->yy_buf_pos = b->yy_ch_buf = base;
- b->yy_is_our_buffer = 0;
- b->yy_input_file = 0;
- b->yy_n_chars = b->yy_buf_size;
- b->yy_is_interactive = 0;
- b->yy_at_bol = 1;
- b->yy_fill_buffer = 0;
- b->yy_buffer_status = YY_BUFFER_NEW;
-
- ncsa__switch_to_buffer(b );
-
- return b;
+ if ( size < 2 ||
+ base[size-2] != YY_END_OF_BUFFER_CHAR ||
+ base[size-1] != YY_END_OF_BUFFER_CHAR )
+ /* They forgot to leave room for the EOB's. */
+ return 0;
+
+ b = (YY_BUFFER_STATE) ncsa_alloc(sizeof( struct yy_buffer_state ) );
+ if ( ! b )
+ YY_FATAL_ERROR( "out of dynamic memory in ncsa__scan_buffer()" );
+
+ b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
+ b->yy_buf_pos = b->yy_ch_buf = base;
+ b->yy_is_our_buffer = 0;
+ b->yy_input_file = 0;
+ b->yy_n_chars = b->yy_buf_size;
+ b->yy_is_interactive = 0;
+ b->yy_at_bol = 1;
+ b->yy_fill_buffer = 0;
+ b->yy_buffer_status = YY_BUFFER_NEW;
+
+ ncsa__switch_to_buffer(b );
+
+ return b;
}
/** Setup the input buffer state to scan a string. The next call to ncsa_lex() will
@@ -1720,7 +1720,7 @@ YY_BUFFER_STATE ncsa__scan_buffer (char * base, yy_size_t size )
YY_BUFFER_STATE ncsa__scan_string (yyconst char * yystr )
{
- return ncsa__scan_bytes(yystr,strlen(yystr) );
+ return ncsa__scan_bytes(yystr,strlen(yystr) );
}
/** Setup the input buffer state to scan the given bytes. The next call to ncsa_lex() will
@@ -1732,32 +1732,32 @@ YY_BUFFER_STATE ncsa__scan_string (yyconst char * yystr )
*/
YY_BUFFER_STATE ncsa__scan_bytes (yyconst char * yybytes, int _yybytes_len )
{
- YY_BUFFER_STATE b;
- char *buf;
- yy_size_t n;
- int i;
+ YY_BUFFER_STATE b;
+ char *buf;
+ yy_size_t n;
+ int i;
- /* Get memory for full buffer, including space for trailing EOB's. */
- n = _yybytes_len + 2;
- buf = (char *) ncsa_alloc(n );
- if ( ! buf )
- YY_FATAL_ERROR( "out of dynamic memory in ncsa__scan_bytes()" );
+ /* Get memory for full buffer, including space for trailing EOB's. */
+ n = _yybytes_len + 2;
+ buf = (char *) ncsa_alloc(n );
+ if ( ! buf )
+ YY_FATAL_ERROR( "out of dynamic memory in ncsa__scan_bytes()" );
- for ( i = 0; i < _yybytes_len; ++i )
- buf[i] = yybytes[i];
+ for ( i = 0; i < _yybytes_len; ++i )
+ buf[i] = yybytes[i];
- buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+ buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
- b = ncsa__scan_buffer(buf,n );
- if ( ! b )
- YY_FATAL_ERROR( "bad buffer in ncsa__scan_bytes()" );
+ b = ncsa__scan_buffer(buf,n );
+ if ( ! b )
+ YY_FATAL_ERROR( "bad buffer in ncsa__scan_bytes()" );
- /* It's okay to grow etc. this buffer, and we should throw it
- * away when we're done.
- */
- b->yy_is_our_buffer = 1;
+ /* It's okay to grow etc. this buffer, and we should throw it
+ * away when we're done.
+ */
+ b->yy_is_our_buffer = 1;
- return b;
+ return b;
}
#ifndef YY_EXIT_FAILURE
@@ -1766,26 +1766,26 @@ YY_BUFFER_STATE ncsa__scan_bytes (yyconst char * yybytes, int _yybytes_len )
static void yy_fatal_error (yyconst char* msg )
{
- (void) fprintf( stderr, "%s\n", msg );
- exit( YY_EXIT_FAILURE );
+ (void) fprintf( stderr, "%s\n", msg );
+ exit( YY_EXIT_FAILURE );
}
/* Redefine yyless() so it works in section 3 code. */
#undef yyless
#define yyless(n) \
- do \
- { \
- /* Undo effects of setting up ncsa_text. */ \
+ do \
+ { \
+ /* Undo effects of setting up ncsa_text. */ \
int yyless_macro_arg = (n); \
YY_LESS_LINENO(yyless_macro_arg);\
- ncsa_text[ncsa_leng] = (yy_hold_char); \
- (yy_c_buf_p) = ncsa_text + yyless_macro_arg; \
- (yy_hold_char) = *(yy_c_buf_p); \
- *(yy_c_buf_p) = '\0'; \
- ncsa_leng = yyless_macro_arg; \
- } \
- while ( 0 )
+ ncsa_text[ncsa_leng] = (yy_hold_char); \
+ (yy_c_buf_p) = ncsa_text + yyless_macro_arg; \
+ (yy_hold_char) = *(yy_c_buf_p); \
+ *(yy_c_buf_p) = '\0'; \
+ ncsa_leng = yyless_macro_arg; \
+ } \
+ while ( 0 )
/* Accessor methods (get/set functions) to struct members. */
@@ -1900,15 +1900,15 @@ int ncsa_lex_destroy (void)
{
/* Pop the buffer stack, destroying each element. */
- while(YY_CURRENT_BUFFER){
- ncsa__delete_buffer(YY_CURRENT_BUFFER );
- YY_CURRENT_BUFFER_LVALUE = NULL;
- ncsa_pop_buffer_state();
- }
+ while(YY_CURRENT_BUFFER){
+ ncsa__delete_buffer(YY_CURRENT_BUFFER );
+ YY_CURRENT_BUFFER_LVALUE = NULL;
+ ncsa_pop_buffer_state();
+ }
- /* Destroy the stack itself. */
- ncsa_free((yy_buffer_stack) );
- (yy_buffer_stack) = NULL;
+ /* Destroy the stack itself. */
+ ncsa_free((yy_buffer_stack) );
+ (yy_buffer_stack) = NULL;
/* Reset the globals. This is important in a non-reentrant scanner so the next time
* ncsa_lex() is called, initialization will occur. */
@@ -1924,43 +1924,43 @@ int ncsa_lex_destroy (void)
#ifndef yytext_ptr
static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
{
- register int i;
- for ( i = 0; i < n; ++i )
- s1[i] = s2[i];
+ register int i;
+ for ( i = 0; i < n; ++i )
+ s1[i] = s2[i];
}
#endif
#ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * s )
{
- register int n;
- for ( n = 0; s[n]; ++n )
- ;
+ register int n;
+ for ( n = 0; s[n]; ++n )
+ ;
- return n;
+ return n;
}
#endif
void *ncsa_alloc (yy_size_t size )
{
- return (void *) malloc( size );
+ return (void *) malloc( size );
}
void *ncsa_realloc (void * ptr, yy_size_t size )
{
- /* The cast to (char *) in the following accommodates both
- * implementations that use char* generic pointers, and those
- * that use void* generic pointers. It works with the latter
- * because both ANSI C and C++ allow castless assignment from
- * any pointer type to void*, and deal with argument conversions
- * as though doing an assignment.
- */
- return (void *) realloc( (char *) ptr, size );
+ /* The cast to (char *) in the following accommodates both
+ * implementations that use char* generic pointers, and those
+ * that use void* generic pointers. It works with the latter
+ * because both ANSI C and C++ allow castless assignment from
+ * any pointer type to void*, and deal with argument conversions
+ * as though doing an assignment.
+ */
+ return (void *) realloc( (char *) ptr, size );
}
void ncsa_free (void * ptr )
{
- free( (char *) ptr ); /* see ncsa_realloc() for (char *) cast */
+ free( (char *) ptr ); /* see ncsa_realloc() for (char *) cast */
}
#define YYTABLES_NAME "yytables"
diff --git a/plug-ins/imagemap/imap_ncsa_parse.c b/plug-ins/imagemap/imap_ncsa_parse.c
index dae0291..7632eff 100644
--- a/plug-ins/imagemap/imap_ncsa_parse.c
+++ b/plug-ins/imagemap/imap_ncsa_parse.c
@@ -177,7 +177,7 @@ typedef union YYSTYPE
}
/* Line 187 of yacc.c. */
#line 180 "y.tab.c"
- YYSTYPE;
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
@@ -321,7 +321,7 @@ YYID (i)
# endif
# if (defined __cplusplus && ! defined _STDLIB_H \
&& ! ((defined YYMALLOC || defined malloc) \
- && (defined YYFREE || defined free)))
+ && (defined YYFREE || defined free)))
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
# ifndef _STDLIB_H
# define _STDLIB_H 1
@@ -347,7 +347,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
#if (! defined yyoverflow \
&& (! defined __cplusplus \
- || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+ || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
/* A type that is properly aligned for any stack member. */
union yyalloc
@@ -372,13 +372,13 @@ union yyalloc
# define YYCOPY(To, From, Count) \
__builtin_memcpy (To, From, (Count) * sizeof (*(From)))
# else
-# define YYCOPY(To, From, Count) \
- do \
- { \
- YYSIZE_T yyi; \
- for (yyi = 0; yyi < (Count); yyi++) \
- (To)[yyi] = (From)[yyi]; \
- } \
+# define YYCOPY(To, From, Count) \
+ do \
+ { \
+ YYSIZE_T yyi; \
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (To)[yyi] = (From)[yyi]; \
+ } \
while (YYID (0))
# endif
# endif
@@ -388,15 +388,15 @@ union yyalloc
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack) \
- do \
- { \
- YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack, Stack, yysize); \
- Stack = &yyptr->Stack; \
- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
- yyptr += yynewbytes / sizeof (*yyptr); \
- } \
+# define YYSTACK_RELOCATE(Stack) \
+ do \
+ { \
+ YYSIZE_T yynewbytes; \
+ YYCOPY (&yyptr->Stack, Stack, yysize); \
+ Stack = &yyptr->Stack; \
+ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+ yyptr += yynewbytes / sizeof (*yyptr); \
+ } \
while (YYID (0))
#endif
@@ -419,7 +419,7 @@ union yyalloc
#define YYUNDEFTOK 2
#define YYMAXUTOK 268
-#define YYTRANSLATE(YYX) \
+#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
@@ -596,44 +596,44 @@ static const yytype_uint8 yystos[] =
31, 11, 11, 14, 11, 14, 11, 14, 11, 11
};
-#define yyerrok (yyerrstatus = 0)
-#define yyclearin (yychar = YYEMPTY)
-#define YYEMPTY (-2)
-#define YYEOF 0
+#define yyerrok (yyerrstatus = 0)
+#define yyclearin (yychar = YYEMPTY)
+#define YYEMPTY (-2)
+#define YYEOF 0
-#define YYACCEPT goto yyacceptlab
-#define YYABORT goto yyabortlab
-#define YYERROR goto yyerrorlab
+#define YYACCEPT goto yyacceptlab
+#define YYABORT goto yyabortlab
+#define YYERROR goto yyerrorlab
/* Like YYERROR except do call yyerror. This remains here temporarily
to ease the transition to the new meaning of YYERROR, for GCC.
Once GCC version 2 has supplanted version 1, this can go. */
-#define YYFAIL goto yyerrlab
+#define YYFAIL goto yyerrlab
#define YYRECOVERING() (!!yyerrstatus)
-#define YYBACKUP(Token, Value) \
-do \
- if (yychar == YYEMPTY && yylen == 1) \
- { \
- yychar = (Token); \
- yylval = (Value); \
- yytoken = YYTRANSLATE (yychar); \
- YYPOPSTACK (1); \
- goto yybackup; \
- } \
- else \
- { \
+#define YYBACKUP(Token, Value) \
+do \
+ if (yychar == YYEMPTY && yylen == 1) \
+ { \
+ yychar = (Token); \
+ yylval = (Value); \
+ yytoken = YYTRANSLATE (yychar); \
+ YYPOPSTACK (1); \
+ goto yybackup; \
+ } \
+ else \
+ { \
yyerror (YY_("syntax error: cannot back up")); \
- YYERROR; \
- } \
+ YYERROR; \
+ } \
while (YYID (0))
-#define YYTERROR 1
-#define YYERRCODE 256
+#define YYTERROR 1
+#define YYERRCODE 256
/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
@@ -642,22 +642,22 @@ while (YYID (0))
#define YYRHSLOC(Rhs, K) ((Rhs)[K])
#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
- do \
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ do \
if (YYID (N)) \
- { \
- (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
- (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
- (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
- (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
- } \
- else \
- { \
- (Current).first_line = (Current).last_line = \
- YYRHSLOC (Rhs, 0).last_line; \
- (Current).first_column = (Current).last_column = \
- YYRHSLOC (Rhs, 0).last_column; \
- } \
+ { \
+ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
+ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
+ (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
+ (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
+ } \
+ else \
+ { \
+ (Current).first_line = (Current).last_line = \
+ YYRHSLOC (Rhs, 0).last_line; \
+ (Current).first_column = (Current).last_column = \
+ YYRHSLOC (Rhs, 0).last_column; \
+ } \
while (YYID (0))
#endif
@@ -668,10 +668,10 @@ while (YYID (0))
#ifndef YY_LOCATION_PRINT
# if YYLTYPE_IS_TRIVIAL
-# define YY_LOCATION_PRINT(File, Loc) \
- fprintf (File, "%d.%d-%d.%d", \
- (Loc).first_line, (Loc).first_column, \
- (Loc).last_line, (Loc).last_column)
+# define YY_LOCATION_PRINT(File, Loc) \
+ fprintf (File, "%d.%d-%d.%d", \
+ (Loc).first_line, (Loc).first_column, \
+ (Loc).last_line, (Loc).last_column)
# else
# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
# endif
@@ -694,21 +694,21 @@ while (YYID (0))
# define YYFPRINTF fprintf
# endif
-# define YYDPRINTF(Args) \
-do { \
- if (yydebug) \
- YYFPRINTF Args; \
+# define YYDPRINTF(Args) \
+do { \
+ if (yydebug) \
+ YYFPRINTF Args; \
} while (YYID (0))
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
-do { \
- if (yydebug) \
- { \
- YYFPRINTF (stderr, "%s ", Title); \
- yy_symbol_print (stderr, \
- Type, Value); \
- YYFPRINTF (stderr, "\n"); \
- } \
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+do { \
+ if (yydebug) \
+ { \
+ YYFPRINTF (stderr, "%s ", Title); \
+ yy_symbol_print (stderr, \
+ Type, Value); \
+ YYFPRINTF (stderr, "\n"); \
+ } \
} while (YYID (0))
@@ -740,7 +740,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
switch (yytype)
{
default:
- break;
+ break;
}
}
@@ -792,10 +792,10 @@ yy_stack_print (bottom, top)
YYFPRINTF (stderr, "\n");
}
-# define YY_STACK_PRINT(Bottom, Top) \
-do { \
- if (yydebug) \
- yy_stack_print ((Bottom), (Top)); \
+# define YY_STACK_PRINT(Bottom, Top) \
+do { \
+ if (yydebug) \
+ yy_stack_print ((Bottom), (Top)); \
} while (YYID (0))
@@ -818,21 +818,21 @@ yy_reduce_print (yyvsp, yyrule)
int yyi;
unsigned long int yylno = yyrline[yyrule];
YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
- yyrule - 1, yylno);
+ yyrule - 1, yylno);
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
fprintf (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
- &(yyvsp[(yyi + 1) - (yynrhs)])
- );
+ &(yyvsp[(yyi + 1) - (yynrhs)])
+ );
fprintf (stderr, "\n");
}
}
-# define YY_REDUCE_PRINT(Rule) \
-do { \
- if (yydebug) \
+# define YY_REDUCE_PRINT(Rule) \
+do { \
+ if (yydebug) \
yy_reduce_print (yyvsp, Rule); \
} while (YYID (0))
@@ -848,7 +848,7 @@ int yydebug;
/* YYINITDEPTH -- initial size of the parser's stacks. */
-#ifndef YYINITDEPTH
+#ifndef YYINITDEPTH
# define YYINITDEPTH 200
#endif
@@ -935,27 +935,27 @@ yytnamerr (char *yyres, const char *yystr)
char const *yyp = yystr;
for (;;)
- switch (*++yyp)
- {
- case '\'':
- case ',':
- goto do_not_strip_quotes;
-
- case '\\':
- if (*++yyp != '\\')
- goto do_not_strip_quotes;
- /* Fall through. */
- default:
- if (yyres)
- yyres[yyn] = *yyp;
- yyn++;
- break;
-
- case '"':
- if (yyres)
- yyres[yyn] = '\0';
- return yyn;
- }
+ switch (*++yyp)
+ {
+ case '\'':
+ case ',':
+ goto do_not_strip_quotes;
+
+ case '\\':
+ if (*++yyp != '\\')
+ goto do_not_strip_quotes;
+ /* Fall through. */
+ default:
+ if (yyres)
+ yyres[yyn] = *yyp;
+ yyn++;
+ break;
+
+ case '"':
+ if (yyres)
+ yyres[yyn] = '\0';
+ return yyn;
+ }
do_not_strip_quotes: ;
}
@@ -993,7 +993,7 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
# if 0
/* This is so xgettext sees the translatable formats that are
- constructed on the fly. */
+ constructed on the fly. */
YY_("syntax error, unexpected %s");
YY_("syntax error, unexpected %s, expecting %s");
YY_("syntax error, unexpected %s, expecting %s or %s");
@@ -1006,13 +1006,13 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
static char const yyexpecting[] = ", expecting %s";
static char const yyor[] = " or %s";
char yyformat[sizeof yyunexpected
- + sizeof yyexpecting - 1
- + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
- * (sizeof yyor - 1))];
+ + sizeof yyexpecting - 1
+ + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+ * (sizeof yyor - 1))];
char const *yyprefix = yyexpecting;
/* Start YYX at -YYN if negative to avoid negative indexes in
- YYCHECK. */
+ YYCHECK. */
int yyxbegin = yyn < 0 ? -yyn : 0;
/* Stay within bounds of both yycheck and yytname. */
@@ -1024,22 +1024,22 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
yyfmt = yystpcpy (yyformat, yyunexpected);
for (yyx = yyxbegin; yyx < yyxend; ++yyx)
- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
- {
- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
- {
- yycount = 1;
- yysize = yysize0;
- yyformat[sizeof yyunexpected - 1] = '\0';
- break;
- }
- yyarg[yycount++] = yytname[yyx];
- yysize1 = yysize + yytnamerr (0, yytname[yyx]);
- yysize_overflow |= (yysize1 < yysize);
- yysize = yysize1;
- yyfmt = yystpcpy (yyfmt, yyprefix);
- yyprefix = yyor;
- }
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+ {
+ if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+ {
+ yycount = 1;
+ yysize = yysize0;
+ yyformat[sizeof yyunexpected - 1] = '\0';
+ break;
+ }
+ yyarg[yycount++] = yytname[yyx];
+ yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+ yysize_overflow |= (yysize1 < yysize);
+ yysize = yysize1;
+ yyfmt = yystpcpy (yyfmt, yyprefix);
+ yyprefix = yyor;
+ }
yyf = YY_(yyformat);
yysize1 = yysize + yystrlen (yyf);
@@ -1047,29 +1047,29 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
yysize = yysize1;
if (yysize_overflow)
- return YYSIZE_MAXIMUM;
+ return YYSIZE_MAXIMUM;
if (yyresult)
- {
- /* Avoid sprintf, as that infringes on the user's name space.
- Don't have undefined behavior even if the translation
- produced a string with the wrong number of "%s"s. */
- char *yyp = yyresult;
- int yyi = 0;
- while ((*yyp = *yyf) != '\0')
- {
- if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
- {
- yyp += yytnamerr (yyp, yyarg[yyi++]);
- yyf += 2;
- }
- else
- {
- yyp++;
- yyf++;
- }
- }
- }
+ {
+ /* Avoid sprintf, as that infringes on the user's name space.
+ Don't have undefined behavior even if the translation
+ produced a string with the wrong number of "%s"s. */
+ char *yyp = yyresult;
+ int yyi = 0;
+ while ((*yyp = *yyf) != '\0')
+ {
+ if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+ {
+ yyp += yytnamerr (yyp, yyarg[yyi++]);
+ yyf += 2;
+ }
+ else
+ {
+ yyp++;
+ yyf++;
+ }
+ }
+ }
return yysize;
}
}
@@ -1103,7 +1103,7 @@ yydestruct (yymsg, yytype, yyvaluep)
{
default:
- break;
+ break;
}
}
@@ -1216,7 +1216,7 @@ yyparse ()
yystate = 0;
yyerrstatus = 0;
yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
+ yychar = YYEMPTY; /* Cause a token to be read. */
/* Initialize stack pointers.
Waste one element of value and location stack
@@ -1246,25 +1246,25 @@ yyparse ()
#ifdef yyoverflow
{
- /* Give user a chance to reallocate the stack. Use copies of
- these so that the &'s don't force the real ones into
- memory. */
- YYSTYPE *yyvs1 = yyvs;
- yytype_int16 *yyss1 = yyss;
+ /* Give user a chance to reallocate the stack. Use copies of
+ these so that the &'s don't force the real ones into
+ memory. */
+ YYSTYPE *yyvs1 = yyvs;
+ yytype_int16 *yyss1 = yyss;
- /* Each stack pointer address is followed by the size of the
- data in use in that stack, in bytes. This used to be a
- conditional around just the two extra args, but that might
- be undefined if yyoverflow is a macro. */
- yyoverflow (YY_("memory exhausted"),
- &yyss1, yysize * sizeof (*yyssp),
- &yyvs1, yysize * sizeof (*yyvsp),
+ /* Each stack pointer address is followed by the size of the
+ data in use in that stack, in bytes. This used to be a
+ conditional around just the two extra args, but that might
+ be undefined if yyoverflow is a macro. */
+ yyoverflow (YY_("memory exhausted"),
+ &yyss1, yysize * sizeof (*yyssp),
+ &yyvs1, yysize * sizeof (*yyvsp),
- &yystacksize);
+ &yystacksize);
- yyss = yyss1;
- yyvs = yyvs1;
+ yyss = yyss1;
+ yyvs = yyvs1;
}
#else /* no yyoverflow */
# ifndef YYSTACK_RELOCATE
@@ -1272,23 +1272,23 @@ yyparse ()
# else
/* Extend the stack our own way. */
if (YYMAXDEPTH <= yystacksize)
- goto yyexhaustedlab;
+ goto yyexhaustedlab;
yystacksize *= 2;
if (YYMAXDEPTH < yystacksize)
- yystacksize = YYMAXDEPTH;
+ yystacksize = YYMAXDEPTH;
{
- yytype_int16 *yyss1 = yyss;
- union yyalloc *yyptr =
- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
- if (! yyptr)
- goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss);
- YYSTACK_RELOCATE (yyvs);
+ yytype_int16 *yyss1 = yyss;
+ union yyalloc *yyptr =
+ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+ if (! yyptr)
+ goto yyexhaustedlab;
+ YYSTACK_RELOCATE (yyss);
+ YYSTACK_RELOCATE (yyvs);
# undef YYSTACK_RELOCATE
- if (yyss1 != yyssa)
- YYSTACK_FREE (yyss1);
+ if (yyss1 != yyssa)
+ YYSTACK_FREE (yyss1);
}
# endif
#endif /* no yyoverflow */
@@ -1298,10 +1298,10 @@ yyparse ()
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
- (unsigned long int) yystacksize));
+ (unsigned long int) yystacksize));
if (yyss + yystacksize - 1 <= yyssp)
- YYABORT;
+ YYABORT;
}
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -1350,7 +1350,7 @@ yybackup:
if (yyn <= 0)
{
if (yyn == 0 || yyn == YYTABLE_NINF)
- goto yyerrlab;
+ goto yyerrlab;
yyn = -yyn;
goto yyreduce;
}
@@ -1410,75 +1410,75 @@ yyreduce:
case 9:
#line 72 "imap_ncsa.y"
{
- g_free ((yyvsp[(2) - (2)].id));
- }
+ g_free ((yyvsp[(2) - (2)].id));
+ }
break;
case 10:
#line 78 "imap_ncsa.y"
{
- MapInfo_t *info = get_map_info();
- g_strreplace(&info->author, (yyvsp[(2) - (2)].id));
- g_free ((yyvsp[(2) - (2)].id));
- }
+ MapInfo_t *info = get_map_info();
+ g_strreplace(&info->author, (yyvsp[(2) - (2)].id));
+ g_free ((yyvsp[(2) - (2)].id));
+ }
break;
case 11:
#line 86 "imap_ncsa.y"
{
- MapInfo_t *info = get_map_info();
- g_strreplace(&info->title, (yyvsp[(2) - (2)].id));
- g_free ((yyvsp[(2) - (2)].id));
- }
+ MapInfo_t *info = get_map_info();
+ g_strreplace(&info->title, (yyvsp[(2) - (2)].id));
+ g_free ((yyvsp[(2) - (2)].id));
+ }
break;
case 12:
#line 94 "imap_ncsa.y"
{
- MapInfo_t *info = get_map_info();
- gchar *description;
-
- description = g_strconcat(info->description, (yyvsp[(2) - (2)].id), "\n",
- NULL);
- g_strreplace(&info->description, description);
- g_free ((yyvsp[(2) - (2)].id));
- }
+ MapInfo_t *info = get_map_info();
+ gchar *description;
+
+ description = g_strconcat(info->description, (yyvsp[(2) - (2)].id), "\n",
+ NULL);
+ g_strreplace(&info->description, description);
+ g_free ((yyvsp[(2) - (2)].id));
+ }
break;
case 20:
#line 117 "imap_ncsa.y"
{
- MapInfo_t *info = get_map_info();
- g_strreplace(&info->default_url, (yyvsp[(2) - (2)].id));
- g_free ((yyvsp[(2) - (2)].id));
- }
+ MapInfo_t *info = get_map_info();
+ g_strreplace(&info->default_url, (yyvsp[(2) - (2)].id));
+ g_free ((yyvsp[(2) - (2)].id));
+ }
break;
case 21:
#line 126 "imap_ncsa.y"
{
- gint x = (gint) (yyvsp[(3) - (8)].value);
- gint y = (gint) (yyvsp[(5) - (8)].value);
- gint width = (gint) fabs((yyvsp[(6) - (8)].value) - x);
- gint height = (gint) fabs((yyvsp[(8) - (8)].value) - y);
- current_object = create_rectangle(x, y, width, height);
- object_set_url(current_object, (yyvsp[(2) - (8)].id));
- add_shape(current_object);
- g_free ((yyvsp[(2) - (8)].id));
- }
+ gint x = (gint) (yyvsp[(3) - (8)].value);
+ gint y = (gint) (yyvsp[(5) - (8)].value);
+ gint width = (gint) fabs((yyvsp[(6) - (8)].value) - x);
+ gint height = (gint) fabs((yyvsp[(8) - (8)].value) - y);
+ current_object = create_rectangle(x, y, width, height);
+ object_set_url(current_object, (yyvsp[(2) - (8)].id));
+ add_shape(current_object);
+ g_free ((yyvsp[(2) - (8)].id));
+ }
break;
case 22:
#line 139 "imap_ncsa.y"
{
- gint x = (gint) (yyvsp[(3) - (8)].value);
- gint y = (gint) (yyvsp[(5) - (8)].value);
- gint r = (gint) fabs((yyvsp[(8) - (8)].value) - (yyvsp[(5) - (8)].value));
- current_object = create_circle(x, y, r);
- object_set_url(current_object, (yyvsp[(2) - (8)].id));
- add_shape(current_object);
- g_free ((yyvsp[(2) - (8)].id));
- }
+ gint x = (gint) (yyvsp[(3) - (8)].value);
+ gint y = (gint) (yyvsp[(5) - (8)].value);
+ gint r = (gint) fabs((yyvsp[(8) - (8)].value) - (yyvsp[(5) - (8)].value));
+ current_object = create_circle(x, y, r);
+ object_set_url(current_object, (yyvsp[(2) - (8)].id));
+ add_shape(current_object);
+ g_free ((yyvsp[(2) - (8)].id));
+ }
break;
case 23:
@@ -1489,26 +1489,26 @@ yyreduce:
case 24:
#line 151 "imap_ncsa.y"
{
- object_set_url(current_object, (yyvsp[(2) - (4)].id));
- add_shape(current_object);
- g_free ((yyvsp[(2) - (4)].id));
- }
+ object_set_url(current_object, (yyvsp[(2) - (4)].id));
+ add_shape(current_object);
+ g_free ((yyvsp[(2) - (4)].id));
+ }
break;
case 26:
#line 160 "imap_ncsa.y"
{
- }
+ }
break;
case 27:
#line 165 "imap_ncsa.y"
{
- Polygon_t *polygon = ObjectToPolygon(current_object);
- GdkPoint *point = new_point((gint) (yyvsp[(1) - (3)].value), (gint) (yyvsp[(3) - (3)].value));
- polygon->points = g_list_append(polygon->points,
- (gpointer) point);
- }
+ Polygon_t *polygon = ObjectToPolygon(current_object);
+ GdkPoint *point = new_point((gint) (yyvsp[(1) - (3)].value), (gint) (yyvsp[(3) - (3)].value));
+ polygon->points = g_list_append(polygon->points,
+ (gpointer) point);
+ }
break;
@@ -1552,35 +1552,35 @@ yyerrlab:
yyerror (YY_("syntax error"));
#else
{
- YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
- if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
- {
- YYSIZE_T yyalloc = 2 * yysize;
- if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
- yyalloc = YYSTACK_ALLOC_MAXIMUM;
- if (yymsg != yymsgbuf)
- YYSTACK_FREE (yymsg);
- yymsg = (char *) YYSTACK_ALLOC (yyalloc);
- if (yymsg)
- yymsg_alloc = yyalloc;
- else
- {
- yymsg = yymsgbuf;
- yymsg_alloc = sizeof yymsgbuf;
- }
- }
-
- if (0 < yysize && yysize <= yymsg_alloc)
- {
- (void) yysyntax_error (yymsg, yystate, yychar);
- yyerror (yymsg);
- }
- else
- {
- yyerror (YY_("syntax error"));
- if (yysize != 0)
- goto yyexhaustedlab;
- }
+ YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+ if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+ {
+ YYSIZE_T yyalloc = 2 * yysize;
+ if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+ yyalloc = YYSTACK_ALLOC_MAXIMUM;
+ if (yymsg != yymsgbuf)
+ YYSTACK_FREE (yymsg);
+ yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+ if (yymsg)
+ yymsg_alloc = yyalloc;
+ else
+ {
+ yymsg = yymsgbuf;
+ yymsg_alloc = sizeof yymsgbuf;
+ }
+ }
+
+ if (0 < yysize && yysize <= yymsg_alloc)
+ {
+ (void) yysyntax_error (yymsg, yystate, yychar);
+ yyerror (yymsg);
+ }
+ else
+ {
+ yyerror (YY_("syntax error"));
+ if (yysize != 0)
+ goto yyexhaustedlab;
+ }
}
#endif
}
@@ -1590,20 +1590,20 @@ yyerrlab:
if (yyerrstatus == 3)
{
/* If just tried and failed to reuse look-ahead token after an
- error, discard it. */
+ error, discard it. */
if (yychar <= YYEOF)
- {
- /* Return failure if at end of input. */
- if (yychar == YYEOF)
- YYABORT;
- }
+ {
+ /* Return failure if at end of input. */
+ if (yychar == YYEOF)
+ YYABORT;
+ }
else
- {
- yydestruct ("Error: discarding",
- yytoken, &yylval);
- yychar = YYEMPTY;
- }
+ {
+ yydestruct ("Error: discarding",
+ yytoken, &yylval);
+ yychar = YYEMPTY;
+ }
}
/* Else will try to reuse look-ahead token after shifting the error
@@ -1635,29 +1635,29 @@ yyerrorlab:
| yyerrlab1 -- common code for both syntax error and YYERROR. |
`-------------------------------------------------------------*/
yyerrlab1:
- yyerrstatus = 3; /* Each real token shifted decrements this. */
+ yyerrstatus = 3; /* Each real token shifted decrements this. */
for (;;)
{
yyn = yypact[yystate];
if (yyn != YYPACT_NINF)
- {
- yyn += YYTERROR;
- if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
- {
- yyn = yytable[yyn];
- if (0 < yyn)
- break;
- }
- }
+ {
+ yyn += YYTERROR;
+ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+ {
+ yyn = yytable[yyn];
+ if (0 < yyn)
+ break;
+ }
+ }
/* Pop the current state because it cannot handle the error token. */
if (yyssp == yyss)
- YYABORT;
+ YYABORT;
yydestruct ("Error: popping",
- yystos[yystate], yyvsp);
+ yystos[yystate], yyvsp);
YYPOPSTACK (1);
yystate = *yyssp;
YY_STACK_PRINT (yyss, yyssp);
@@ -1703,7 +1703,7 @@ yyexhaustedlab:
yyreturn:
if (yychar != YYEOF && yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead",
- yytoken, &yylval);
+ yytoken, &yylval);
/* Do not reclaim the symbols of the rule which action triggered
this YYABORT or YYACCEPT. */
YYPOPSTACK (yylen);
@@ -1711,7 +1711,7 @@ yyreturn:
while (yyssp != yyss)
{
yydestruct ("Cleanup: popping",
- yystos[*yyssp], yyvsp);
+ yystos[*yyssp], yyvsp);
YYPOPSTACK (1);
}
#ifndef yyoverflow
diff --git a/plug-ins/imagemap/imap_ncsa_parse.h b/plug-ins/imagemap/imap_ncsa_parse.h
index 0acc4a9..d784ea6 100644
--- a/plug-ins/imagemap/imap_ncsa_parse.h
+++ b/plug-ins/imagemap/imap_ncsa_parse.h
@@ -78,7 +78,7 @@ typedef union YYSTYPE
}
/* Line 1489 of yacc.c. */
#line 81 "y.tab.h"
- YYSTYPE;
+ YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
diff --git a/plug-ins/imagemap/imap_object.c b/plug-ins/imagemap/imap_object.c
index 4106090..127bbab 100644
--- a/plug-ins/imagemap/imap_object.c
+++ b/plug-ins/imagemap/imap_object.c
@@ -40,7 +40,7 @@ static ObjectList_t *_paste_buffer;
static gpointer
object_list_callback_add(ObjectListCallback_t *list,
- ObjectListCallbackFunc_t func, gpointer data)
+ ObjectListCallbackFunc_t func, gpointer data)
{
ObjectListCB_t *cb = g_new(ObjectListCB_t, 1);
cb->func = func;
@@ -67,49 +67,49 @@ object_list_callback_call(ObjectListCallback_t *list, Object_t *obj)
gpointer
object_list_add_changed_cb(ObjectList_t *list, ObjectListCallbackFunc_t func,
- gpointer data)
+ gpointer data)
{
return object_list_callback_add(&list->changed_cb, func, data);
}
gpointer
object_list_add_update_cb(ObjectList_t *list, ObjectListCallbackFunc_t func,
- gpointer data)
+ gpointer data)
{
return object_list_callback_add(&list->update_cb, func, data);
}
gpointer
object_list_add_add_cb(ObjectList_t *list, ObjectListCallbackFunc_t func,
- gpointer data)
+ gpointer data)
{
return object_list_callback_add(&list->add_cb, func, data);
}
gpointer
object_list_add_remove_cb(ObjectList_t *list, ObjectListCallbackFunc_t func,
- gpointer data)
+ gpointer data)
{
return object_list_callback_add(&list->remove_cb, func, data);
}
gpointer
object_list_add_select_cb(ObjectList_t *list, ObjectListCallbackFunc_t func,
- gpointer data)
+ gpointer data)
{
return object_list_callback_add(&list->select_cb, func, data);
}
gpointer
object_list_add_move_cb(ObjectList_t *list, ObjectListCallbackFunc_t func,
- gpointer data)
+ gpointer data)
{
return object_list_callback_add(&list->move_cb, func, data);
}
gpointer
object_list_add_geometry_cb(ObjectList_t *list, ObjectListCallbackFunc_t func,
- gpointer data)
+ gpointer data)
{
return object_list_callback_add(&list->geometry_cb, func, data);
}
@@ -408,9 +408,9 @@ do_object_locked_dialog(void)
default_dialog_hide_cancel_button(dialog);
default_dialog_hide_apply_button(dialog);
default_dialog_set_label(
- dialog,
- "\n You cannot delete the selected object \n"
- "since it is currently being edited.\n");
+ dialog,
+ "\n You cannot delete the selected object \n"
+ "since it is currently being edited.\n");
}
default_dialog_show(dialog);
}
@@ -423,7 +423,7 @@ object_factory_create_object(ObjectFactory_t *factory, gint x, gint y)
static gboolean
button_motion(GtkWidget *widget, GdkEventMotion *event,
- ObjectFactory_t *factory)
+ ObjectFactory_t *factory)
{
gint x = get_real_coord((gint) event->x);
gint y = get_real_coord((gint) event->y);
@@ -452,45 +452,45 @@ object_on_button_press(GtkWidget *widget, GdkEventButton *event, gpointer data)
if (obj) {
if (event->button == 1) {
- if (!factory->finish || factory->finish(obj, x, y)) {
- g_signal_handlers_disconnect_by_func(widget,
+ if (!factory->finish || factory->finish(obj, x, y)) {
+ g_signal_handlers_disconnect_by_func(widget,
button_motion,
factory);
- if (object_is_valid(obj)) {
- Command_t *command = create_command_new(get_shapes(), obj);
- command_execute(command);
- if (preferences->prompt_for_area_info)
- object_edit(obj, FALSE);
- } else {
+ if (object_is_valid(obj)) {
+ Command_t *command = create_command_new(get_shapes(), obj);
+ command_execute(command);
+ if (preferences->prompt_for_area_info)
+ object_edit(obj, FALSE);
+ } else {
object_draw(obj, gtk_widget_get_window (widget));
object_unref(obj);
- }
- gdk_gc_set_function(preferences->normal_gc, GDK_COPY);
- obj = NULL;
- main_clear_dimension();
- }
+ }
+ gdk_gc_set_function(preferences->normal_gc, GDK_COPY);
+ obj = NULL;
+ main_clear_dimension();
+ }
} else if (event->button == 3) {
object_draw(obj, gtk_widget_get_window (widget));
- if (!factory->cancel || factory->cancel(event, obj)) {
- g_signal_handlers_disconnect_by_func(widget,
+ if (!factory->cancel || factory->cancel(event, obj)) {
+ g_signal_handlers_disconnect_by_func(widget,
button_motion,
factory);
- object_unref(obj);
- gdk_gc_set_function(preferences->normal_gc, GDK_COPY);
- obj = NULL;
- main_clear_dimension();
- } else {
+ object_unref(obj);
+ gdk_gc_set_function(preferences->normal_gc, GDK_COPY);
+ obj = NULL;
+ main_clear_dimension();
+ } else {
object_draw(obj, gtk_widget_get_window (widget));
- }
+ }
}
} else {
if (event->button == 1) {
- factory = ((ObjectFactory_t*(*)(guint)) data)(event->state);
- obj = object_factory_create_object(factory, x, y);
+ factory = ((ObjectFactory_t*(*)(guint)) data)(event->state);
+ obj = object_factory_create_object(factory, x, y);
- gdk_gc_set_function(preferences->normal_gc, GDK_XOR);
+ gdk_gc_set_function(preferences->normal_gc, GDK_XOR);
- g_signal_connect(widget, "motion-notify-event",
+ g_signal_connect(widget, "motion-notify-event",
G_CALLBACK(button_motion), factory);
}
}
@@ -596,7 +596,7 @@ object_list_draw_selected(ObjectList_t *list, GdkWindow *window)
for (p = list->list; p; p = p->next) {
Object_t *obj = (Object_t*) p->data;
if (obj->selected)
- object_draw(obj, window);
+ object_draw(obj, window);
}
}
@@ -608,25 +608,25 @@ object_list_find(ObjectList_t *list, gint x, gint y)
for (p = list->list; p; p = p->next) {
Object_t *obj = (Object_t*) p->data;
if (obj->class->point_is_on(obj, x, y))
- found = obj;
+ found = obj;
}
return found;
}
Object_t*
object_list_near_sash(ObjectList_t *list, gint x, gint y,
- MoveSashFunc_t *sash_func)
+ MoveSashFunc_t *sash_func)
{
Object_t *found = NULL;
GList *p;
for (p = list->list; p; p = p->next) {
Object_t *obj = (Object_t*) p->data;
if (obj->selected) {
- MoveSashFunc_t func = obj->class->near_sash(obj, x, y);
- if (func) {
- found = obj;
- *sash_func = func;
- }
+ MoveSashFunc_t func = obj->class->near_sash(obj, x, y);
+ if (func) {
+ found = obj;
+ *sash_func = func;
+ }
}
}
return found;
@@ -672,13 +672,13 @@ object_list_cut(ObjectList_t *list)
Object_t *obj = (Object_t*) p->data;
q = p->next;
if (obj->selected) {
- if (obj->locked) {
- do_object_locked_dialog();
- } else {
- object_list_append(_paste_buffer, obj);
- object_list_remove_link(list, p);
- count++;
- }
+ if (obj->locked) {
+ do_object_locked_dialog();
+ } else {
+ object_list_append(_paste_buffer, obj);
+ object_list_remove_link(list, p);
+ count++;
+ }
}
}
object_list_set_changed(list, (count) ? TRUE : FALSE);
@@ -694,7 +694,7 @@ object_list_copy_to_paste_buffer(ObjectList_t *list)
for (p = list->list; p; p = p->next) {
Object_t *obj = (Object_t*) p->data;
if (obj->selected)
- object_list_append(_paste_buffer, object_clone(obj));
+ object_list_append(_paste_buffer, object_clone(obj));
}
}
@@ -712,12 +712,12 @@ object_list_delete_selected(ObjectList_t *list)
Object_t *obj = (Object_t*) p->data;
q = p->next;
if (obj->selected) {
- if (obj->locked) {
- do_object_locked_dialog();
- } else {
- object_list_remove_link(list, p);
- object_unref(obj);
- }
+ if (obj->locked) {
+ do_object_locked_dialog();
+ } else {
+ object_list_remove_link(list, p);
+ object_unref(obj);
+ }
}
}
}
@@ -729,8 +729,8 @@ object_list_edit_selected(ObjectList_t *list)
for (p = list->list; p; p = p->next) {
Object_t *obj = (Object_t*) p->data;
if (obj->selected) {
- object_edit(obj, TRUE);
- break;
+ object_edit(obj, TRUE);
+ break;
}
}
}
@@ -743,8 +743,8 @@ object_list_select_all(ObjectList_t *list)
for (p = list->list; p; p = p->next) {
Object_t *obj = (Object_t*) p->data;
if (!obj->selected) {
- object_select(obj);
- count++;
+ object_select(obj);
+ count++;
}
}
return count;
@@ -757,15 +757,15 @@ object_list_select_next(ObjectList_t *list)
for (p = list->list; p; p = p->next) {
Object_t *obj = (Object_t*) p->data;
if (obj->selected) {
- object_unselect(obj);
- p = (p->next) ? p->next : list->list;
- object_select((Object_t*) p->data);
- for (p = p->next; p; p = p->next) {
- obj = (Object_t*) p->data;
- if (obj->selected)
- object_unselect(obj);
- }
- break;
+ object_unselect(obj);
+ p = (p->next) ? p->next : list->list;
+ object_select((Object_t*) p->data);
+ for (p = p->next; p; p = p->next) {
+ obj = (Object_t*) p->data;
+ if (obj->selected)
+ object_unselect(obj);
+ }
+ break;
}
}
}
@@ -776,21 +776,21 @@ void object_list_select_prev(ObjectList_t *list)
for (p = list->list; p; p = p->next) {
Object_t *obj = (Object_t*) p->data;
if (obj->selected) {
- GList *q = (p->prev) ? p->prev : g_list_last(list->list);
- for (; p; p = p->next) {
- obj = (Object_t*) p->data;
- if (obj->selected)
- object_unselect(obj);
- }
- object_select((Object_t*) q->data);
- break;
+ GList *q = (p->prev) ? p->prev : g_list_last(list->list);
+ for (; p; p = p->next) {
+ obj = (Object_t*) p->data;
+ if (obj->selected)
+ object_unselect(obj);
+ }
+ object_select((Object_t*) q->data);
+ break;
}
}
}
gint
object_list_select_region(ObjectList_t *list, gint x, gint y, gint width,
- gint height)
+ gint height)
{
GList *p;
gint count = 0;
@@ -800,9 +800,9 @@ object_list_select_region(ObjectList_t *list, gint x, gint y, gint width,
object_get_dimensions(obj, &obj_x, &obj_y, &obj_width, &obj_height);
if (obj_x >= x && obj_x + obj_width <= x + width &&
- obj_y >= y && obj_y + obj_height <= y + height) {
- object_select(obj);
- count++;
+ obj_y >= y && obj_y + obj_height <= y + height) {
+ object_select(obj);
+ count++;
}
}
return count;
@@ -816,8 +816,8 @@ object_list_deselect_all(ObjectList_t *list, Object_t *exception)
for (p = list->list; p; p = p->next) {
Object_t *obj = (Object_t*) p->data;
if (obj->selected && obj != exception) {
- object_unselect(obj);
- count++;
+ object_unselect(obj);
+ count++;
}
}
return count;
@@ -831,7 +831,7 @@ object_list_nr_selected(ObjectList_t *list)
for (p = list->list; p; p = p->next) {
Object_t *obj = (Object_t*) p->data;
if (obj->selected)
- count++;
+ count++;
}
return count;
}
@@ -873,7 +873,7 @@ object_list_move_selected(ObjectList_t *list, gint dx, gint dy)
for (p = list->list; p; p = p->next) {
Object_t *obj = (Object_t*) p->data;
if (obj->selected)
- object_move(obj, dx, dy);
+ object_move(obj, dx, dy);
}
}
@@ -899,7 +899,7 @@ object_list_move_selected_up(ObjectList_t *list)
for (p = list->list; p; p = p->next) {
Object_t *obj = (Object_t*) p->data;
if (obj->selected && p->prev)
- object_list_swap_prev(list, p);
+ object_list_swap_prev(list, p);
}
}
@@ -911,7 +911,7 @@ object_list_move_selected_down(ObjectList_t *list)
for (p = g_list_last(list->list); p; p = p->prev) {
Object_t *obj = (Object_t*) p->data;
if (obj->selected && p->next)
- object_list_swap_next(list, p);
+ object_list_swap_next(list, p);
}
}
@@ -925,8 +925,8 @@ object_list_move_to_front(ObjectList_t *list)
Object_t *obj = (Object_t*) p->data;
q = p->next;
if (obj->selected) {
- object_list_remove_link(list, p);
- object_list_append(list, obj);
+ object_list_remove_link(list, p);
+ object_list_append(list, obj);
}
}
}
@@ -941,8 +941,8 @@ object_list_send_to_back(ObjectList_t *list)
Object_t *obj = (Object_t*) p->data;
q = p->next;
if (obj->selected) {
- object_list_remove_link(list, p);
- object_list_prepend(list, obj);
+ object_list_remove_link(list, p);
+ object_list_prepend(list, obj);
}
}
}
@@ -954,14 +954,14 @@ object_list_move_sash_selected(ObjectList_t *list, gint dx, gint dy)
for (p = list->list; p; p = p->next) {
Object_t *obj = (Object_t*) p->data;
if (obj->selected)
- object_move_sash(obj, dx, dy);
+ object_move_sash(obj, dx, dy);
}
}
static void
write_xml_attrib(const gchar *attrib, const gchar *value,
- const gchar *default_text, gpointer param,
- OutputFunc_t output)
+ const gchar *default_text, gpointer param,
+ OutputFunc_t output)
{
if (*value) {
gchar *escaped_value = g_markup_escape_text(value, -1);
@@ -1012,7 +1012,7 @@ object_list_write_ncsa(ObjectList_t *list, gpointer param, OutputFunc_t output)
Object_t *obj = (Object_t*) p->data;
if (*obj->comment)
- output(param, "# %s\n", obj->comment);
+ output(param, "# %s\n", obj->comment);
obj->class->write_ncsa(obj, param, output);
output(param, "\n");
}
diff --git a/plug-ins/imagemap/imap_object.h b/plug-ins/imagemap/imap_object.h
index 2524a3f..e5f97c9 100644
--- a/plug-ins/imagemap/imap_object.h
+++ b/plug-ins/imagemap/imap_object.h
@@ -31,18 +31,18 @@ typedef struct ObjectList_t ObjectList_t;
#include "imap_menu_funcs.h"
struct Object_t {
- ObjectClass_t *class;
- ObjectList_t *list;
- gint refcount;
- gboolean selected;
- gboolean locked;
- gchar *url;
- gchar *target;
- gchar *comment;
- gchar *mouse_over;
- gchar *mouse_out;
- gchar *focus;
- gchar *blur;
+ ObjectClass_t *class;
+ ObjectList_t *list;
+ gint refcount;
+ gboolean selected;
+ gboolean locked;
+ gchar *url;
+ gchar *target;
+ gchar *comment;
+ gchar *mouse_over;
+ gchar *mouse_out;
+ gchar *focus;
+ gchar *blur;
};
typedef void (*MoveSashFunc_t)(Object_t*, gint, gint);
@@ -51,10 +51,10 @@ typedef void (*OutputFunc_t)(gpointer, const char*, ...) G_GNUC_PRINTF(2,3);
struct AreaInfoDialog_t;
struct ObjectClass_t {
- const gchar *name;
- AreaInfoDialog_t *info_dialog;
- GdkPixmap *icon;
- GdkBitmap *mask;
+ const gchar *name;
+ AreaInfoDialog_t *info_dialog;
+ GdkPixmap *icon;
+ GdkBitmap *mask;
gboolean (*is_valid)(Object_t *obj);
void (*destruct)(Object_t *obj);
@@ -66,7 +66,7 @@ struct ObjectClass_t {
MoveSashFunc_t (*near_sash)(Object_t *obj, gint x, gint y);
gboolean (*point_is_on)(Object_t *obj, gint x, gint y);
void (*get_dimensions)(Object_t *obj, gint *x, gint *y, gint *width,
- gint *height);
+ gint *height);
void (*resize)(Object_t *obj, gint percentage_x, gint percentage_y);
void (*move)(Object_t *obj, gint dx, gint dy);
gpointer (*create_info_widget)(GtkWidget *frame);
@@ -110,28 +110,28 @@ void object_emit_geometry_signal(Object_t *obj);
void object_emit_update_signal(Object_t *obj);
#define object_is_valid(obj) \
- ((obj)->class->is_valid(obj))
+ ((obj)->class->is_valid(obj))
#define object_get_dimensions(obj, x, y, width, height) \
- ((obj)->class->get_dimensions((obj), (x), (y), (width), (height)))
+ ((obj)->class->get_dimensions((obj), (x), (y), (width), (height)))
#define object_normalize(obj) \
- ((obj)->class->normalize(obj))
+ ((obj)->class->normalize(obj))
#define object_resize(obj, per_x, per_y) \
- ((obj)->class->resize((obj), (per_x), (per_y)))
+ ((obj)->class->resize((obj), (per_x), (per_y)))
#define object_update(obj, data) \
- ((obj)->class->update((obj), (data)))
+ ((obj)->class->update((obj), (data)))
#define object_update_info_widget(obj, data) \
- ((obj)->class->update_info_widget((obj), (data)))
+ ((obj)->class->update_info_widget((obj), (data)))
#define object_fill_info_tab(obj, data) \
- ((obj)->class->fill_info_tab((obj), (data)))
+ ((obj)->class->fill_info_tab((obj), (data)))
#define object_get_stock_icon_name(obj) \
- ((obj)->class->get_stock_icon_name())
+ ((obj)->class->get_stock_icon_name())
typedef struct {
Object_t *obj;
@@ -142,7 +142,7 @@ typedef struct {
} ObjectFactory_t;
gboolean object_on_button_press(GtkWidget *widget, GdkEventButton *event,
- gpointer data);
+ gpointer data);
typedef struct {
GList *list;
@@ -175,7 +175,7 @@ void object_list_draw(ObjectList_t *list, GdkWindow *window);
void object_list_draw_selected(ObjectList_t *list, GdkWindow *window);
Object_t *object_list_find(ObjectList_t *list, gint x, gint y);
Object_t *object_list_near_sash(ObjectList_t *list, gint x, gint y,
- MoveSashFunc_t *sash_func);
+ MoveSashFunc_t *sash_func);
gint object_list_cut(ObjectList_t *list);
void object_list_copy_to_paste_buffer(ObjectList_t *list);
@@ -188,11 +188,11 @@ gint object_list_select_all(ObjectList_t *list);
void object_list_select_next(ObjectList_t *list);
void object_list_select_prev(ObjectList_t *list);
gint object_list_select_region(ObjectList_t *list, gint x, gint y, gint width,
- gint height);
+ gint height);
gint object_list_deselect_all(ObjectList_t *list, Object_t *exception);
gint object_list_nr_selected(ObjectList_t *list);
void object_list_resize(ObjectList_t *list, gint percentage_x,
- gint percentage_y);
+ gint percentage_y);
void object_list_move_selected(ObjectList_t *list, gint dx, gint dy);
void object_list_move_up(ObjectList_t *list, Object_t *obj);
void object_list_move_down(ObjectList_t *list, Object_t *obj);
@@ -203,33 +203,33 @@ void object_list_send_to_back(ObjectList_t *list);
void object_list_move_sash_selected(ObjectList_t *list, gint dx, gint dy);
void object_list_write_csim(ObjectList_t *list, gpointer param,
- OutputFunc_t output);
+ OutputFunc_t output);
void object_list_write_cern(ObjectList_t *list, gpointer param,
- OutputFunc_t output);
+ OutputFunc_t output);
void object_list_write_ncsa(ObjectList_t *list, gpointer param,
- OutputFunc_t output);
+ OutputFunc_t output);
typedef void (*ObjectListCallbackFunc_t)(Object_t*, gpointer);
gpointer object_list_add_changed_cb(ObjectList_t *list,
- ObjectListCallbackFunc_t func,
- gpointer data);
+ ObjectListCallbackFunc_t func,
+ gpointer data);
gpointer object_list_add_update_cb(ObjectList_t *list,
- ObjectListCallbackFunc_t func,
- gpointer data);
+ ObjectListCallbackFunc_t func,
+ gpointer data);
gpointer object_list_add_add_cb(ObjectList_t *list,
- ObjectListCallbackFunc_t func, gpointer data);
+ ObjectListCallbackFunc_t func, gpointer data);
gpointer object_list_add_remove_cb(ObjectList_t *list,
- ObjectListCallbackFunc_t func,
- gpointer data);
+ ObjectListCallbackFunc_t func,
+ gpointer data);
gpointer object_list_add_select_cb(ObjectList_t *list,
- ObjectListCallbackFunc_t func,
- gpointer data);
+ ObjectListCallbackFunc_t func,
+ gpointer data);
gpointer object_list_add_move_cb(ObjectList_t *list,
- ObjectListCallbackFunc_t func, gpointer data);
+ ObjectListCallbackFunc_t func, gpointer data);
gpointer object_list_add_geometry_cb(ObjectList_t *list,
- ObjectListCallbackFunc_t func,
- gpointer data);
+ ObjectListCallbackFunc_t func,
+ gpointer data);
void object_list_remove_add_cb(ObjectList_t *list, gpointer id);
void object_list_remove_select_cb(ObjectList_t *list, gpointer id);
@@ -239,13 +239,13 @@ void object_list_remove_geometry_cb(ObjectList_t *list, gpointer id);
#define object_list_clear_changed(list) ((list)->changed = FALSE)
#define object_list_set_changed(list, ischanged) \
- ((list)->changed = (ischanged))
+ ((list)->changed = (ischanged))
#define object_list_get_changed(list) ((list)->changed)
void clear_paste_buffer(void);
gpointer paste_buffer_add_add_cb(ObjectListCallbackFunc_t func, gpointer data);
gpointer paste_buffer_add_remove_cb(ObjectListCallbackFunc_t func,
- gpointer data);
+ gpointer data);
ObjectList_t *get_paste_buffer(void);
void do_object_locked_dialog(void);
diff --git a/plug-ins/imagemap/imap_object_popup.c b/plug-ins/imagemap/imap_object_popup.c
index dc72522..bee4fdb 100644
--- a/plug-ins/imagemap/imap_object_popup.c
+++ b/plug-ins/imagemap/imap_object_popup.c
@@ -39,11 +39,11 @@ object_handle_popup(ObjectPopup_t *popup, Object_t *obj, GdkEventButton *event)
#ifdef _TEMP_
gtk_widget_set_sensitive(popup->up, (position > 1) ? TRUE : FALSE);
gtk_widget_set_sensitive(popup->down,
- (position < g_list_length(obj->list->list))
- ? TRUE : FALSE);
+ (position < g_list_length(obj->list->list))
+ ? TRUE : FALSE);
#endif
gtk_menu_popup(GTK_MENU(popup->menu), NULL, NULL, NULL, NULL,
- event->button, event->time);
+ event->button, event->time);
}
void
diff --git a/plug-ins/imagemap/imap_object_popup.h b/plug-ins/imagemap/imap_object_popup.h
index 09740ab..c3d7993 100644
--- a/plug-ins/imagemap/imap_object_popup.h
+++ b/plug-ins/imagemap/imap_object_popup.h
@@ -33,7 +33,7 @@ typedef struct {
} ObjectPopup_t;
void object_handle_popup(ObjectPopup_t *popup, Object_t *obj,
- GdkEventButton *event);
+ GdkEventButton *event);
void object_do_popup(Object_t *obj, GdkEventButton *event);
#endif /* _IMAP_OBJECT_POPUP_H */
diff --git a/plug-ins/imagemap/imap_polygon.c b/plug-ins/imagemap/imap_polygon.c
index 5a25f68..a6f61c9 100644
--- a/plug-ins/imagemap/imap_polygon.c
+++ b/plug-ins/imagemap/imap_polygon.c
@@ -49,9 +49,9 @@ static void polygon_draw_sashes(Object_t* obj, GdkWindow *window, GdkGC* gc);
static MoveSashFunc_t polygon_near_sash(Object_t *obj, gint x, gint y);
static gboolean polygon_point_is_on(Object_t *obj, gint x, gint y);
static void polygon_get_dimensions(Object_t *obj, gint *x, gint *y,
- gint *width, gint *height);
+ gint *width, gint *height);
static void polygon_resize(Object_t *obj, gint percentage_x,
- gint percentage_y);
+ gint percentage_y);
static void polygon_move(Object_t *obj, gint dx, gint dy);
static gpointer polygon_create_info_widget(GtkWidget *frame);
static void polygon_update_info_widget(Object_t *obj, gpointer data);
@@ -59,25 +59,25 @@ static void polygon_fill_info_tab(Object_t *obj, gpointer data);
static void polygon_set_initial_focus(Object_t *obj, gpointer data);
static void polygon_update(Object_t* obj, gpointer data);
static void polygon_write_csim(Object_t* obj, gpointer param,
- OutputFunc_t output);
+ OutputFunc_t output);
static void polygon_write_cern(Object_t* obj, gpointer param,
- OutputFunc_t output);
+ OutputFunc_t output);
static void polygon_write_ncsa(Object_t* obj, gpointer param,
- OutputFunc_t output);
+ OutputFunc_t output);
static void polygon_do_popup(Object_t *obj, GdkEventButton *event);
static const gchar* polygon_get_stock_icon_name(void);
static ObjectClass_t polygon_class = {
N_("_Polygon"),
- NULL, /* info_dialog */
- NULL, /* icon */
- NULL, /* mask */
+ NULL, /* info_dialog */
+ NULL, /* icon */
+ NULL, /* mask */
polygon_is_valid,
polygon_destruct,
polygon_clone,
polygon_assign,
- NULL, /* polygon_normalize */
+ NULL, /* polygon_normalize */
polygon_draw,
polygon_draw_sashes,
polygon_near_sash,
@@ -193,8 +193,8 @@ polygon_near_sash(Object_t *obj, gint x, gint y)
for (p = polygon->points; p; p = p->next, _sash_index++) {
GdkPoint *point = (GdkPoint*) p->data;
if (near_sash(point->x, point->y, x, y)) {
- _sash_point = point;
- return move_sash;
+ _sash_point = point;
+ return move_sash;
}
}
return NULL;
@@ -229,7 +229,7 @@ polygon_point_is_on(Object_t *obj, gint x, gint y)
for (; p; p = p->next) {
GdkPoint *point = (GdkPoint*) p->data;
if (right_intersect(prev, point, x, y))
- count++;
+ count++;
prev = point;
}
if (right_intersect(prev, first, x, y))
@@ -240,7 +240,7 @@ polygon_point_is_on(Object_t *obj, gint x, gint y)
static void
polygon_get_dimensions(Object_t *obj, gint *x, gint *y,
- gint *width, gint *height)
+ gint *width, gint *height)
{
Polygon_t *polygon = ObjectToPolygon(obj);
gint min_x = G_MAXINT, min_y = G_MAXINT;
@@ -250,13 +250,13 @@ polygon_get_dimensions(Object_t *obj, gint *x, gint *y,
for (p = polygon->points; p; p = p->next) {
GdkPoint *point = (GdkPoint*) p->data;
if (point->x < min_x)
- min_x = point->x;
+ min_x = point->x;
if (point->x > max_x)
- max_x = point->x;
+ max_x = point->x;
if (point->y < min_y)
- min_y = point->y;
+ min_y = point->y;
if (point->y > max_y)
- max_y = point->y;
+ max_y = point->y;
}
*x = min_x;
*y = min_y;
@@ -298,7 +298,7 @@ typedef struct {
GtkWidget *insert;
GtkWidget *append;
GtkWidget *remove;
- gint selected_row;
+ gint selected_row;
guint timeout;
} PolygonProperties_t;
@@ -342,7 +342,7 @@ static void
set_buttons_sensitivity(PolygonProperties_t *data)
{
gint rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL(data->store),
- NULL);
+ NULL);
gtk_widget_set_sensitive(data->insert, rows != MAX_POLYGON_POINTS);
gtk_widget_set_sensitive(data->append, rows != MAX_POLYGON_POINTS);
gtk_widget_set_sensitive(data->remove, rows > 2);
@@ -364,7 +364,7 @@ insert_button_clicked(GtkWidget *widget, PolygonProperties_t *data)
gtk_tree_model_get (model, &iter, 0, &point, -1);
here = g_list_find(polygon->points, point);
polygon->points = g_list_insert_before(polygon->points, here,
- new_point(x, y));
+ new_point(x, y));
polygon_fill_info_tab(data->obj, data);
}
}
@@ -417,7 +417,7 @@ y_changed_cb(GtkWidget *widget, gpointer data)
static void
render_x(GtkTreeViewColumn *column, GtkCellRenderer *cell,
- GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
+ GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
GdkPoint *point;
gchar scratch[16];
@@ -429,7 +429,7 @@ render_x(GtkTreeViewColumn *column, GtkCellRenderer *cell,
static void
render_y(GtkTreeViewColumn *column, GtkCellRenderer *cell,
- GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
+ GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
GdkPoint *point;
gchar scratch[16];
@@ -457,9 +457,9 @@ polygon_create_info_widget(GtkWidget *frame)
swin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(swin),
- GTK_SHADOW_IN);
+ GTK_SHADOW_IN);
gtk_box_pack_start(GTK_BOX(hbox), swin, FALSE, FALSE, FALSE);
gtk_widget_show(swin);
@@ -471,19 +471,19 @@ polygon_create_info_widget(GtkWidget *frame)
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("x (pixels)"),
- renderer,
- NULL);
+ renderer,
+ NULL);
gtk_tree_view_column_set_cell_data_func(column, renderer,
- render_x, props, NULL);
+ render_x, props, NULL);
gtk_tree_view_column_set_alignment(column, 0.5);
gtk_tree_view_append_column (GTK_TREE_VIEW (view), column);
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("y (pixels)"),
- renderer,
- NULL);
+ renderer,
+ NULL);
gtk_tree_view_column_set_cell_data_func(column, renderer,
- render_y, props, NULL);
+ render_y, props, NULL);
gtk_tree_view_column_set_alignment(column, 0.5);
gtk_tree_view_append_column (GTK_TREE_VIEW (view), column);
@@ -497,41 +497,41 @@ polygon_create_info_widget(GtkWidget *frame)
label = create_label_in_table(table, 0, 0, "_x:");
props->x = create_spin_button_in_table(table, label, 0, 1, 1, 0,
- max_width - 1);
+ max_width - 1);
g_signal_connect(props->x, "changed",
- G_CALLBACK(x_changed_cb), (gpointer) props);
+ G_CALLBACK(x_changed_cb), (gpointer) props);
gtk_widget_set_size_request(props->x, 64, -1);
create_label_in_table(table, 0, 2, _("pixels"));
label = create_label_in_table(table, 1, 0, "_y:");
props->y = create_spin_button_in_table(table, label, 1, 1, 1, 0,
- max_height - 1);
+ max_height - 1);
g_signal_connect(props->y, "changed",
- G_CALLBACK(y_changed_cb), (gpointer) props);
+ G_CALLBACK(y_changed_cb), (gpointer) props);
gtk_widget_set_size_request(props->y, 64, -1);
create_label_in_table(table, 1, 2, _("pixels"));
props->update = gtk_button_new_with_mnemonic(_("_Update"));
g_signal_connect(props->update, "clicked",
- G_CALLBACK(update_button_clicked), props);
+ G_CALLBACK(update_button_clicked), props);
gtk_table_attach_defaults(GTK_TABLE(table), props->update, 1, 2, 2, 3);
gtk_widget_show(props->update);
props->insert = gtk_button_new_with_mnemonic(_("_Insert"));
g_signal_connect(props->insert, "clicked",
- G_CALLBACK(insert_button_clicked), props);
+ G_CALLBACK(insert_button_clicked), props);
gtk_table_attach_defaults(GTK_TABLE(table), props->insert, 1, 2, 3, 4);
gtk_widget_show(props->insert);
props->append = gtk_button_new_with_mnemonic(_("A_ppend"));
g_signal_connect(props->append, "clicked",
- G_CALLBACK(append_button_clicked), props);
+ G_CALLBACK(append_button_clicked), props);
gtk_table_attach_defaults(GTK_TABLE(table), props->append, 1, 2, 4, 5);
gtk_widget_show(props->append);
props->remove = gtk_button_new_with_mnemonic(_("_Remove"));
g_signal_connect(props->remove, "clicked",
- G_CALLBACK(remove_button_clicked), props);
+ G_CALLBACK(remove_button_clicked), props);
gtk_table_attach_defaults(GTK_TABLE(table), props->remove, 1, 2, 5, 6);
gtk_widget_show(props->remove);
@@ -540,7 +540,7 @@ polygon_create_info_widget(GtkWidget *frame)
props->selection = gtk_tree_view_get_selection(GTK_TREE_VIEW (view));
gtk_tree_selection_set_mode(props->selection, GTK_SELECTION_SINGLE);
g_signal_connect (props->selection, "changed",
- G_CALLBACK (select_row_cb), props);
+ G_CALLBACK (select_row_cb), props);
return props;
}
@@ -563,7 +563,7 @@ polygon_update_info_widget(Object_t *obj, gpointer data)
gtk_spin_button_set_value(GTK_SPIN_BUTTON(props->y), _sash_point->y);
if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(props->store), &iter,
- NULL, _sash_index)) {
+ NULL, _sash_index)) {
gtk_tree_selection_select_iter(props->selection, &iter);
}
@@ -590,7 +590,7 @@ polygon_fill_info_tab(Object_t *obj, gpointer data)
}
if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(props->store), &iter,
- NULL, _sash_index)) {
+ NULL, _sash_index)) {
gtk_tree_selection_select_iter(props->selection, &iter);
}
set_buttons_sensitivity(props);
@@ -704,7 +704,7 @@ polygon_near_edge(Object_t *obj, gint x, gint y)
for (p = p->next; p; p = p->next, n++) {
GdkPoint *next = (GdkPoint*) p->data;
if (point_near_edge(prev, next, x, y))
- return n;
+ return n;
prev = next;
}
return (point_near_edge(prev, first, x, y)) ? n + 1 : 0;
@@ -819,7 +819,7 @@ polygon_factory_set_xy(Object_t *obj, guint state, gint x, gint y)
}
static ObjectFactory_t polygon_factory = {
- NULL, /* Object pointer */
+ NULL, /* Object pointer */
polygon_factory_finish,
polygon_factory_cancel,
polygon_factory_create_object,
diff --git a/plug-ins/imagemap/imap_preferences.c b/plug-ins/imagemap/imap_preferences.c
index 4b9f0bc..69f594a 100644
--- a/plug-ins/imagemap/imap_preferences.c
+++ b/plug-ins/imagemap/imap_preferences.c
@@ -42,34 +42,34 @@
#include "libgimp/stdplugins-intl.h"
typedef struct {
- DefaultDialog_t *dialog;
- GtkWidget *notebook;
- GtkWidget *ncsa;
- GtkWidget *cern;
- GtkWidget *csim;
- GtkWidget *prompt_for_area_info;
- GtkWidget *require_default_url;
- GtkWidget *show_area_handle;
- GtkWidget *keep_circles_round;
- GtkWidget *show_url_tip;
- GtkWidget *use_doublesized;
-
- GtkWidget *undo_levels;
- GtkWidget *mru_size;
-
- GtkWidget *normal_fg;
- GtkWidget *normal_bg;
- GtkWidget *selected_fg;
- GtkWidget *selected_bg;
-
- GtkWidget *threshold;
- GtkWidget *auto_convert;
-
- PreferencesData_t *old_data;
+ DefaultDialog_t *dialog;
+ GtkWidget *notebook;
+ GtkWidget *ncsa;
+ GtkWidget *cern;
+ GtkWidget *csim;
+ GtkWidget *prompt_for_area_info;
+ GtkWidget *require_default_url;
+ GtkWidget *show_area_handle;
+ GtkWidget *keep_circles_round;
+ GtkWidget *show_url_tip;
+ GtkWidget *use_doublesized;
+
+ GtkWidget *undo_levels;
+ GtkWidget *mru_size;
+
+ GtkWidget *normal_fg;
+ GtkWidget *normal_bg;
+ GtkWidget *selected_fg;
+ GtkWidget *selected_bg;
+
+ GtkWidget *threshold;
+ GtkWidget *auto_convert;
+
+ PreferencesData_t *old_data;
} PreferencesDialog_t;
static void get_button_colors (PreferencesDialog_t *dialog,
- ColorSelData_t *colors);
+ ColorSelData_t *colors);
static gint
parse_map_type(void)
@@ -117,7 +117,7 @@ parse_line(PreferencesData_t *data, char *line)
char *token;
ColorSelData_t *colors = &data->colors;
- line++; /* Skip '(' */
+ line++; /* Skip '(' */
token = strtok(line, " ");
if (!strcmp(token, "default-map-type")) {
@@ -137,11 +137,11 @@ parse_line(PreferencesData_t *data, char *line)
} else if (!strcmp(token, "mru-size")) {
data->mru_size = parse_int();
if (data->mru_size < 1)
- data->mru_size = 1;
+ data->mru_size = 1;
} else if (!strcmp(token, "undo-levels")) {
data->undo_levels = parse_int();
if (data->undo_levels < 1)
- data->undo_levels = 1;
+ data->undo_levels = 1;
} else if (!strcmp(token, "normal-fg-color")) {
parse_color(&colors->normal_fg);
} else if (!strcmp(token, "normal-bg-color")) {
@@ -170,9 +170,9 @@ preferences_load(PreferencesData_t *data)
g_free(filename);
if (in) {
while (fgets(buf, sizeof(buf), in)) {
- if (*buf != '\n' && *buf != '#') {
- parse_line(data, buf);
- }
+ if (*buf != '\n' && *buf != '#') {
+ parse_line(data, buf);
+ }
}
fclose(in);
return TRUE;
@@ -193,40 +193,40 @@ preferences_save(PreferencesData_t *data)
if (out) {
fprintf(out, "# Image map plug-in resource file\n\n");
if (data->default_map_type == NCSA)
- fprintf(out, "(default-map-type ncsa)\n");
+ fprintf(out, "(default-map-type ncsa)\n");
else if (data->default_map_type == CERN)
- fprintf(out, "(default-map-type cern)\n");
+ fprintf(out, "(default-map-type cern)\n");
else
- fprintf(out, "(default-map-type csim)\n");
+ fprintf(out, "(default-map-type csim)\n");
fprintf(out, "(prompt-for-area-info %s)\n",
- (data->prompt_for_area_info) ? "yes" : "no");
+ (data->prompt_for_area_info) ? "yes" : "no");
fprintf(out, "(require-default-url %s)\n",
- (data->require_default_url) ? "yes" : "no");
+ (data->require_default_url) ? "yes" : "no");
fprintf(out, "(show-area-handle %s)\n",
- (data->show_area_handle) ? "yes" : "no");
+ (data->show_area_handle) ? "yes" : "no");
fprintf(out, "(keep-circles-round %s)\n",
- (data->keep_circles_round) ? "yes" : "no");
+ (data->keep_circles_round) ? "yes" : "no");
fprintf(out, "(show-url-tip %s)\n",
- (data->show_url_tip) ? "yes" : "no");
+ (data->show_url_tip) ? "yes" : "no");
fprintf(out, "(use-doublesized %s)\n",
- (data->use_doublesized) ? "yes" : "no");
+ (data->use_doublesized) ? "yes" : "no");
fprintf(out, "(undo-levels %d)\n", data->undo_levels);
fprintf(out, "(mru-size %d)\n", data->mru_size);
fprintf(out, "(normal-fg-color %d %d %d)\n",
- colors->normal_fg.red, colors->normal_fg.green,
- colors->normal_fg.blue);
+ colors->normal_fg.red, colors->normal_fg.green,
+ colors->normal_fg.blue);
fprintf(out, "(normal-bg-color %d %d %d)\n",
- colors->normal_bg.red, colors->normal_bg.green,
- colors->normal_bg.blue);
+ colors->normal_bg.red, colors->normal_bg.green,
+ colors->normal_bg.blue);
fprintf(out, "(selected-fg-color %d %d %d)\n",
- colors->selected_fg.red, colors->selected_fg.green,
- colors->selected_fg.blue);
+ colors->selected_fg.red, colors->selected_fg.green,
+ colors->selected_fg.blue);
fprintf(out, "(selected-bg-color %d %d %d)\n",
- colors->selected_bg.red, colors->selected_bg.green,
- colors->selected_bg.blue);
+ colors->selected_bg.red, colors->selected_bg.green,
+ colors->selected_bg.blue);
mru_write(get_mru(), out);
@@ -338,7 +338,7 @@ create_tab(GtkWidget *notebook, const gchar *label, gint rows, gint cols)
gtk_widget_show(table);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox,
- gtk_label_new_with_mnemonic(label));
+ gtk_label_new_with_mnemonic(label));
return table;
}
@@ -380,7 +380,7 @@ create_general_tab(PreferencesDialog_t *data, GtkWidget *notebook)
create_check_button_in_table(table, 5, 0, _("Show area URL _tip"));
data->use_doublesized =
create_check_button_in_table(table, 6, 0,
- _("_Use double-sized grab handles"));
+ _("_Use double-sized grab handles"));
gtk_widget_show(frame);
}
@@ -391,25 +391,25 @@ create_menu_tab(PreferencesDialog_t *data, GtkWidget *notebook)
GtkWidget *label;
label = create_label_in_table(table, 0, 0,
- _("Number of _undo levels (1 - 99):"));
+ _("Number of _undo levels (1 - 99):"));
data->undo_levels = create_spin_button_in_table(table, label, 0, 1, 1, 1,
- 99);
+ 99);
label = create_label_in_table(table, 1, 0,
- _("Number of M_RU entries (1 - 16):"));
+ _("Number of M_RU entries (1 - 16):"));
data->mru_size = create_spin_button_in_table(table, label, 1, 1, 1, 1, 16);
}
static GtkWidget*
create_color_field(PreferencesDialog_t *data, GtkWidget *table, gint row,
- gint col)
+ gint col)
{
GimpRGB color = {0.0, 0.0, 0.0, 1.0};
GtkWidget *area = gimp_color_button_new (_("Select Color"), 16, 8, &color,
- GIMP_COLOR_AREA_FLAT);
+ GIMP_COLOR_AREA_FLAT);
gimp_color_button_set_update (GIMP_COLOR_BUTTON (area), TRUE);
gtk_table_attach_defaults (GTK_TABLE (table), area, col, col + 1, row,
- row + 1);
+ row + 1);
gtk_widget_show (area);
return area;
@@ -437,7 +437,7 @@ create_contiguous_regions_tab(PreferencesDialog_t *data, GtkWidget *notebook)
GtkWidget *label;
label = create_label_in_table(table, 0, 0,
- _("_Threshold:"));
+ _("_Threshold:"));
data->auto_convert =
create_check_button_in_table(table, 1, 0, _("_Automatically convert"));
}
@@ -491,20 +491,20 @@ do_preferences_dialog(void)
GTK_TOGGLE_BUTTON(dialog->prompt_for_area_info),
old_data->prompt_for_area_info);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->require_default_url),
- old_data->require_default_url);
+ old_data->require_default_url);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->show_area_handle),
- old_data->show_area_handle);
+ old_data->show_area_handle);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->keep_circles_round),
- old_data->keep_circles_round);
+ old_data->keep_circles_round);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->show_url_tip),
- old_data->show_url_tip);
+ old_data->show_url_tip);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->use_doublesized),
- old_data->use_doublesized);
+ old_data->use_doublesized);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->undo_levels),
- old_data->undo_levels);
+ old_data->undo_levels);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->mru_size),
- old_data->mru_size);
+ old_data->mru_size);
set_button_colors(dialog, &old_data->colors);
diff --git a/plug-ins/imagemap/imap_preferences.h b/plug-ins/imagemap/imap_preferences.h
index 541a4e7..d27e444 100644
--- a/plug-ins/imagemap/imap_preferences.h
+++ b/plug-ins/imagemap/imap_preferences.h
@@ -33,20 +33,20 @@ typedef struct {
} ColorSelData_t;
typedef struct {
- gint default_map_type;
- gboolean prompt_for_area_info;
- gboolean require_default_url;
- gboolean show_area_handle;
- gboolean keep_circles_round;
- gboolean show_url_tip;
- gboolean use_doublesized;
- gboolean auto_convert;
- gdouble threshold;
- gint undo_levels;
- gint mru_size;
- ColorSelData_t colors;
- GdkGC *normal_gc;
- GdkGC *selected_gc;
+ gint default_map_type;
+ gboolean prompt_for_area_info;
+ gboolean require_default_url;
+ gboolean show_area_handle;
+ gboolean keep_circles_round;
+ gboolean show_url_tip;
+ gboolean use_doublesized;
+ gboolean auto_convert;
+ gdouble threshold;
+ gint undo_levels;
+ gint mru_size;
+ ColorSelData_t colors;
+ GdkGC *normal_gc;
+ GdkGC *selected_gc;
} PreferencesData_t;
void do_preferences_dialog(void);
diff --git a/plug-ins/imagemap/imap_preview.c b/plug-ins/imagemap/imap_preview.c
index 3165ba8..4a965b9 100644
--- a/plug-ins/imagemap/imap_preview.c
+++ b/plug-ins/imagemap/imap_preview.c
@@ -35,26 +35,26 @@
#include "imap_preview.h"
#define PREVIEW_MASK (GDK_EXPOSURE_MASK | \
- GDK_POINTER_MOTION_MASK | \
+ GDK_POINTER_MOTION_MASK | \
GDK_BUTTON_PRESS_MASK | \
- GDK_BUTTON_RELEASE_MASK | \
- GDK_BUTTON_MOTION_MASK | \
- GDK_KEY_PRESS_MASK | \
- GDK_KEY_RELEASE_MASK | \
- GDK_ENTER_NOTIFY_MASK | \
- GDK_LEAVE_NOTIFY_MASK)
+ GDK_BUTTON_RELEASE_MASK | \
+ GDK_BUTTON_MOTION_MASK | \
+ GDK_KEY_PRESS_MASK | \
+ GDK_KEY_RELEASE_MASK | \
+ GDK_ENTER_NOTIFY_MASK | \
+ GDK_LEAVE_NOTIFY_MASK)
#define PREVIEW_SIZE 400
/*======================================================================
- Preview Rendering Util routine
+ Preview Rendering Util routine
=======================================================================*/
#define CHECKWIDTH 4
#define LIGHTCHECK 192
#define DARKCHECK 128
#ifndef OPAQUE
-#define OPAQUE 255
+#define OPAQUE 255
#endif
static Preview_t*
@@ -78,10 +78,10 @@ preview_get_height(GtkWidget *preview)
static void
render_gray_image(Preview_t *preview_base, GimpPixelRgn *srcrgn)
{
- guchar *src_row, *dest_buffer, *src, *dest;
- gint row, col;
- gint bpp, dwidth, dheight, pwidth, pheight;
- gint *src_col;
+ guchar *src_row, *dest_buffer, *src, *dest;
+ gint row, col;
+ gint bpp, dwidth, dheight, pwidth, pheight;
+ gint *src_col;
GtkWidget *preview = preview_base->preview;
dwidth = srcrgn->w;
@@ -101,13 +101,13 @@ render_gray_image(Preview_t *preview_base, GimpPixelRgn *srcrgn)
for (row = 0; row < pheight; row++) {
gimp_pixel_rgn_get_row(srcrgn, src_row, 0, row * dheight / pheight,
- dwidth);
+ dwidth);
src = src_row;
for (col = 0; col < pwidth; col++) {
- src = &src_row[src_col[col]];
- *dest++ = *src;
+ src = &src_row[src_col[col]];
+ *dest++ = *src;
}
}
gimp_preview_area_draw (GIMP_PREVIEW_AREA (preview),
@@ -124,14 +124,14 @@ render_gray_image(Preview_t *preview_base, GimpPixelRgn *srcrgn)
static void
render_indexed_image(Preview_t *preview_base, GimpPixelRgn *srcrgn)
{
- guchar *src_row, *dest_buffer, *src, *dest;
- gint row, col;
- gint dwidth, dheight, pwidth, pheight;
- gint *src_col;
- gint bpp, alpha, has_alpha;
- guchar *cmap, *colour;
- gint ncols;
- gboolean gray = get_map_info()->show_gray;
+ guchar *src_row, *dest_buffer, *src, *dest;
+ gint row, col;
+ gint dwidth, dheight, pwidth, pheight;
+ gint *src_col;
+ gint bpp, alpha, has_alpha;
+ guchar *cmap, *colour;
+ gint ncols;
+ gboolean gray = get_map_info()->show_gray;
GtkWidget *preview = preview_base->preview;
dwidth = srcrgn->w;
@@ -157,23 +157,23 @@ render_indexed_image(Preview_t *preview_base, GimpPixelRgn *srcrgn)
dest = dest_buffer;
for (row = 0; row < pheight; row++) {
gimp_pixel_rgn_get_row(srcrgn, src_row, 0, row * dheight / pheight,
- dwidth);
+ dwidth);
for (col = 0; col < pwidth; col++) {
- src = &src_row[src_col[col]];
- colour = cmap + 3 * (int)(*src);
-
- if (gray) {
- guchar avg = (299 * colour[0] + 587 * colour[1] +
- 114 * colour[2]) / 1000;
- *dest++ = avg;
- *dest++ = avg;
- *dest++ = avg;
- } else {
- *dest++ = colour[0];
- *dest++ = colour[1];
- *dest++ = colour[2];
- }
+ src = &src_row[src_col[col]];
+ colour = cmap + 3 * (int)(*src);
+
+ if (gray) {
+ guchar avg = (299 * colour[0] + 587 * colour[1] +
+ 114 * colour[2]) / 1000;
+ *dest++ = avg;
+ *dest++ = avg;
+ *dest++ = avg;
+ } else {
+ *dest++ = colour[0];
+ *dest++ = colour[1];
+ *dest++ = colour[2];
+ }
}
}
gimp_preview_area_draw(GIMP_PREVIEW_AREA(preview),
@@ -189,13 +189,13 @@ render_indexed_image(Preview_t *preview_base, GimpPixelRgn *srcrgn)
static void
render_rgb_image(Preview_t *preview_base, GimpPixelRgn *srcrgn)
{
- guchar *src_row, *dest_buffer, *src, *dest;
- gint row, col;
- gint dwidth, dheight, pwidth, pheight;
- gint *src_col;
- gint bpp, alpha, has_alpha, b;
- guchar check;
- gboolean gray = get_map_info()->show_gray;
+ guchar *src_row, *dest_buffer, *src, *dest;
+ gint row, col;
+ gint dwidth, dheight, pwidth, pheight;
+ gint *src_col;
+ gint bpp, alpha, has_alpha, b;
+ guchar check;
+ gboolean gray = get_map_info()->show_gray;
GtkWidget *preview = preview_base->preview;
dwidth = srcrgn->w;
@@ -218,39 +218,39 @@ render_rgb_image(Preview_t *preview_base, GimpPixelRgn *srcrgn)
dest = dest_buffer;
for (row = 0; row < pheight; row++) {
gimp_pixel_rgn_get_row(srcrgn, src_row, 0, row * dheight / pheight,
- dwidth);
+ dwidth);
for (col = 0; col < pwidth; col++) {
- src = &src_row[src_col[col]];
- if(!has_alpha || src[alpha] == OPAQUE) {
- /* no alpha channel or opaque -- simple way */
- for (b = 0; b < alpha; b++)
- dest[b] = src[b];
- } else {
- /* more or less transparent */
- if( ( col % (CHECKWIDTH*2) < CHECKWIDTH ) ^
- ( row % (CHECKWIDTH*2) < CHECKWIDTH ) )
- check = LIGHTCHECK;
- else
- check = DARKCHECK;
-
- if (src[alpha] == 0) {
- /* full transparent -- check */
- for (b = 0; b < alpha; b++)
- dest[b] = check;
- } else {
- /* middlemost transparent -- mix check and src */
- for (b = 0; b < alpha; b++)
- dest[b] = (src[b] * src[alpha] +
- check * (OPAQUE - src[alpha])) / OPAQUE;
- }
- }
- if (gray) {
- guchar avg;
- avg = (299 * dest[0] + 587 * dest[1] + 114 * dest[2]) / 1000;
- for (b = 0; b < alpha; b++)
- dest[b] = avg;
- }
- dest += alpha;
+ src = &src_row[src_col[col]];
+ if(!has_alpha || src[alpha] == OPAQUE) {
+ /* no alpha channel or opaque -- simple way */
+ for (b = 0; b < alpha; b++)
+ dest[b] = src[b];
+ } else {
+ /* more or less transparent */
+ if( ( col % (CHECKWIDTH*2) < CHECKWIDTH ) ^
+ ( row % (CHECKWIDTH*2) < CHECKWIDTH ) )
+ check = LIGHTCHECK;
+ else
+ check = DARKCHECK;
+
+ if (src[alpha] == 0) {
+ /* full transparent -- check */
+ for (b = 0; b < alpha; b++)
+ dest[b] = check;
+ } else {
+ /* middlemost transparent -- mix check and src */
+ for (b = 0; b < alpha; b++)
+ dest[b] = (src[b] * src[alpha] +
+ check * (OPAQUE - src[alpha])) / OPAQUE;
+ }
+ }
+ if (gray) {
+ guchar avg;
+ avg = (299 * dest[0] + 587 * dest[1] + 114 * dest[2]) / 1000;
+ for (b = 0; b < alpha; b++)
+ dest[b] = avg;
+ }
+ dest += alpha;
}
}
gimp_preview_area_draw (GIMP_PREVIEW_AREA (preview),
@@ -304,7 +304,7 @@ add_preview_motion_event(Preview_t *preview, GCallback func)
g_return_if_fail (func != NULL);
g_signal_connect(preview->preview, "motion-notify-event",
- func, NULL);
+ func, NULL);
}
void
@@ -313,7 +313,7 @@ add_enter_notify_event(Preview_t *preview, GCallback func)
g_return_if_fail (func != NULL);
g_signal_connect(preview->preview, "enter-notify-event",
- func, NULL);
+ func, NULL);
}
void
@@ -322,7 +322,7 @@ add_leave_notify_event(Preview_t *preview, GCallback func)
g_return_if_fail (func != NULL);
g_signal_connect(preview->preview, "leave-notify-event",
- func, NULL);
+ func, NULL);
}
void
@@ -331,7 +331,7 @@ add_preview_button_press_event(Preview_t *preview, GCallback func)
g_return_if_fail (func != NULL);
g_signal_connect(preview->preview, "button-press-event",
- func, NULL);
+ func, NULL);
}
void
@@ -376,7 +376,7 @@ static const GtkTargetEntry target_table[] =
static void
handle_drop(GtkWidget *widget, GdkDragContext *context, gint x, gint y,
- GtkSelectionData *data, guint info, guint time)
+ GtkSelectionData *data, guint info, guint time)
{
gboolean success = FALSE;
@@ -441,15 +441,15 @@ make_preview (GimpDrawable *drawable)
g_object_set_data (G_OBJECT (preview), "preview", data);
gtk_widget_set_events(GTK_WIDGET(preview), PREVIEW_MASK);
g_signal_connect_after(preview, "expose-event",
- G_CALLBACK(preview_expose), data);
+ G_CALLBACK(preview_expose), data);
g_signal_connect (preview, "size-allocate",
G_CALLBACK (preview_size_allocate), (gpointer)data);
/* Handle drop of links in preview widget */
gtk_drag_dest_set(preview, GTK_DEST_DEFAULT_ALL, target_table,
- 2, GDK_ACTION_COPY);
+ 2, GDK_ACTION_COPY);
g_signal_connect(preview, "drag-data-received",
- G_CALLBACK(handle_drop), NULL);
+ G_CALLBACK(handle_drop), NULL);
data->widget_width = data->width =
gimp_drawable_width(drawable->drawable_id);
@@ -467,11 +467,11 @@ make_preview (GimpDrawable *drawable)
button = gtk_button_new();
gtk_widget_set_can_focus (button, FALSE);
gtk_table_attach(GTK_TABLE(table), button, 0, 1, 0, 1, GTK_FILL, GTK_FILL,
- 0, 0);
+ 0, 0);
gtk_widget_set_events(button,
- GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
+ GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
g_signal_connect(button, "button-press-event",
- G_CALLBACK(arrow_cb), NULL);
+ G_CALLBACK(arrow_cb), NULL);
gtk_widget_show(button);
arrow = gtk_arrow_new(GTK_ARROW_RIGHT, GTK_SHADOW_OUT);
@@ -481,8 +481,8 @@ make_preview (GimpDrawable *drawable)
/* Create horizontal ruler */
data->hruler = ruler = gimp_ruler_new (GTK_ORIENTATION_HORIZONTAL);
g_signal_connect_swapped(preview, "motion-notify-event",
- G_CALLBACK(GTK_WIDGET_GET_CLASS(ruler)->motion_notify_event),
- ruler);
+ G_CALLBACK(GTK_WIDGET_GET_CLASS(ruler)->motion_notify_event),
+ ruler);
gtk_table_attach(GTK_TABLE(table), ruler, 1, 2, 0, 1,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
@@ -491,20 +491,20 @@ make_preview (GimpDrawable *drawable)
/* Create vertical ruler */
data->vruler = ruler = gimp_ruler_new (GTK_ORIENTATION_VERTICAL);
g_signal_connect_swapped(preview, "motion-notify-event",
- G_CALLBACK(GTK_WIDGET_GET_CLASS(ruler)->motion_notify_event),
- ruler);
+ G_CALLBACK(GTK_WIDGET_GET_CLASS(ruler)->motion_notify_event),
+ ruler);
gtk_table_attach(GTK_TABLE(table), ruler, 0, 1, 1, 2,
GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show(ruler);
window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(window),
- GTK_POLICY_NEVER, GTK_POLICY_NEVER);
+ GTK_POLICY_NEVER, GTK_POLICY_NEVER);
width = (data->width > 600) ? 600 : data->width;
height = (data->height > 400) ? 400 : data->height;
gtk_widget_set_size_request(window, width, height);
gtk_table_attach(GTK_TABLE(table), window, 1, 2, 1, 2, GTK_FILL, GTK_FILL,
- 0, 0);
+ 0, 0);
gtk_widget_show(window);
hadj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (window));
@@ -540,7 +540,7 @@ make_preview (GimpDrawable *drawable)
gtk_widget_show (preview);
gimp_pixel_rgn_init(&data->src_rgn, drawable, 0, 0, data->width,
- data->height, FALSE, FALSE);
+ data->height, FALSE, FALSE);
render_preview(data, &data->src_rgn);
gtk_widget_show(table);
diff --git a/plug-ins/imagemap/imap_preview.h b/plug-ins/imagemap/imap_preview.h
index 3992854..b757886 100644
--- a/plug-ins/imagemap/imap_preview.h
+++ b/plug-ins/imagemap/imap_preview.h
@@ -27,12 +27,12 @@
typedef struct {
GimpDrawable *drawable;
- GtkWidget *window;
- GtkWidget *preview;
- GtkWidget *hruler;
- GtkWidget *vruler;
- gint width;
- gint height;
+ GtkWidget *window;
+ GtkWidget *preview;
+ GtkWidget *hruler;
+ GtkWidget *vruler;
+ gint width;
+ gint height;
gint widget_width;
gint widget_height;
GimpPixelRgn src_rgn;
@@ -53,6 +53,6 @@ gint preview_get_height(GtkWidget *preview);
void preview_zoom(Preview_t *preview, gint zoom_factor);
GdkCursorType preview_set_cursor(Preview_t *preview,
- GdkCursorType cursor_type);
+ GdkCursorType cursor_type);
#endif /* _IMAP_PREVIEW_H */
diff --git a/plug-ins/imagemap/imap_rectangle.c b/plug-ins/imagemap/imap_rectangle.c
index b3b7298..0b40be6 100644
--- a/plug-ins/imagemap/imap_rectangle.c
+++ b/plug-ins/imagemap/imap_rectangle.c
@@ -48,30 +48,30 @@ static void rectangle_draw_sashes(Object_t *obj, GdkWindow *window, GdkGC* gc);
static MoveSashFunc_t rectangle_near_sash(Object_t *obj, gint x, gint y);
static gboolean rectangle_point_is_on(Object_t *obj, gint x, gint y);
static void rectangle_get_dimensions(Object_t *obj, gint *x, gint *y,
- gint *width, gint *height);
+ gint *width, gint *height);
static void rectangle_resize(Object_t *obj, gint percentage_x,
- gint percentage_y);
+ gint percentage_y);
static void rectangle_move(Object_t *obj, gint dx, gint dy);
static gpointer rectangle_create_info_widget(GtkWidget *frame);
static void rectangle_fill_info_tab(Object_t *obj, gpointer data);
static void rectangle_set_initial_focus(Object_t *obj, gpointer data);
static void rectangle_update(Object_t *obj, gpointer data);
static void rectangle_write_csim(Object_t *obj, gpointer param,
- OutputFunc_t output);
+ OutputFunc_t output);
static void rectangle_write_cern(Object_t *obj, gpointer param,
- OutputFunc_t output);
+ OutputFunc_t output);
static void rectangle_write_ncsa(Object_t *obj, gpointer param,
- OutputFunc_t output);
+ OutputFunc_t output);
static const gchar* rectangle_get_stock_icon_name(void);
static ObjectClass_t rectangle_class = {
N_("_Rectangle"),
- NULL, /* info_dialog */
- NULL, /* icon */
- NULL, /* mask */
+ NULL, /* info_dialog */
+ NULL, /* icon */
+ NULL, /* mask */
rectangle_is_valid,
- NULL, /* rectangle_destruct */
+ NULL, /* rectangle_destruct */
rectangle_clone,
rectangle_assign,
rectangle_normalize,
@@ -83,7 +83,7 @@ static ObjectClass_t rectangle_class = {
rectangle_resize,
rectangle_move,
rectangle_create_info_widget,
- rectangle_fill_info_tab, /* rectangle_update_info_widget */
+ rectangle_fill_info_tab, /* rectangle_update_info_widget */
rectangle_fill_info_tab,
rectangle_set_initial_focus,
rectangle_update,
@@ -107,7 +107,7 @@ create_rectangle(gint x, gint y, gint width, gint height)
static void
draw_any_rectangle(GdkWindow *window, GdkGC *gc, gint x, gint y, gint w,
- gint h)
+ gint h)
{
if (w < 0) {
x += w;
@@ -170,7 +170,7 @@ rectangle_draw(Object_t *obj, GdkWindow *window, GdkGC *gc)
{
Rectangle_t *rectangle = ObjectToRectangle(obj);
draw_any_rectangle(window, gc, rectangle->x, rectangle->y,
- rectangle->width, rectangle->height);
+ rectangle->width, rectangle->height);
}
static void
@@ -182,12 +182,12 @@ rectangle_draw_sashes(Object_t *obj, GdkWindow *window, GdkGC *gc)
draw_sash(window, gc, rectangle->x + rectangle->width, rectangle->y);
draw_sash(window, gc, rectangle->x, rectangle->y + rectangle->height / 2);
draw_sash(window, gc, rectangle->x + rectangle->width,
- rectangle->y + rectangle->height / 2);
+ rectangle->y + rectangle->height / 2);
draw_sash(window, gc, rectangle->x, rectangle->y + rectangle->height);
draw_sash(window, gc, rectangle->x + rectangle->width / 2,
- rectangle->y + rectangle->height);
+ rectangle->y + rectangle->height);
draw_sash(window, gc, rectangle->x + rectangle->width,
- rectangle->y + rectangle->height);
+ rectangle->y + rectangle->height);
}
static void
@@ -267,18 +267,18 @@ rectangle_near_sash(Object_t *obj, gint x, gint y)
else if (near_sash(rectangle->x + rectangle->width, rectangle->y, x, y))
return MoveUpperRightSash;
else if (near_sash(rectangle->x, rectangle->y + rectangle->height / 2,
- x, y))
+ x, y))
return MoveLeftSash;
else if (near_sash(rectangle->x + rectangle->width,
- rectangle->y + rectangle->height / 2, x, y))
+ rectangle->y + rectangle->height / 2, x, y))
return MoveRightSash;
else if (near_sash(rectangle->x, rectangle->y + rectangle->height, x, y))
return MoveLowerLeftSash;
else if (near_sash(rectangle->x + rectangle->width / 2,
- rectangle->y + rectangle->height, x, y))
+ rectangle->y + rectangle->height, x, y))
return MoveLowerSash;
else if (near_sash(rectangle->x + rectangle->width,
- rectangle->y + rectangle->height, x, y))
+ rectangle->y + rectangle->height, x, y))
return MoveLowerRightSash;
return NULL;
}
@@ -293,7 +293,7 @@ rectangle_point_is_on(Object_t *obj, gint x, gint y)
static void
rectangle_get_dimensions(Object_t *obj, gint *x, gint *y,
- gint *width, gint *height)
+ gint *width, gint *height)
{
Rectangle_t *rectangle = ObjectToRectangle(obj);
*x = rectangle->x;
@@ -387,30 +387,30 @@ rectangle_create_info_widget(GtkWidget *frame)
label = create_label_in_table(table, 0, 0, _("Upper left _x:"));
props->x = create_spin_button_in_table(table, label, 0, 1, 1, 0,
- max_width - 1);
+ max_width - 1);
g_signal_connect(props->x, "value-changed",
- G_CALLBACK(x_changed_cb), (gpointer) props);
+ G_CALLBACK(x_changed_cb), (gpointer) props);
create_label_in_table(table, 0, 3, _("pixels"));
label = create_label_in_table(table, 1, 0, _("Upper left _y:"));
props->y = create_spin_button_in_table(table, label, 1, 1, 1, 0,
- max_height - 1);
+ max_height - 1);
g_signal_connect(props->y, "value-changed",
- G_CALLBACK(y_changed_cb), (gpointer) props);
+ G_CALLBACK(y_changed_cb), (gpointer) props);
create_label_in_table(table, 1, 3, _("pixels"));
label = create_label_in_table(table, 2, 0, _("_Width:"));
props->width = create_spin_button_in_table(table, label, 2, 1, 1, 1,
- max_width);
+ max_width);
g_signal_connect(props->width, "value-changed",
- G_CALLBACK(width_changed_cb), (gpointer) props);
+ G_CALLBACK(width_changed_cb), (gpointer) props);
create_label_in_table(table, 2, 3, _("pixels"));
label = create_label_in_table(table, 3, 0, _("_Height:"));
props->height = create_spin_button_in_table(table, label, 3, 1, 1, 1,
- max_height);
+ max_height);
g_signal_connect(props->height, "value-changed",
- G_CALLBACK(height_changed_cb), (gpointer) props);
+ G_CALLBACK(height_changed_cb), (gpointer) props);
create_label_in_table(table, 3, 3, _("pixels"));
chain_button = gimp_chain_button_new(GIMP_CHAIN_RIGHT);
@@ -432,7 +432,7 @@ rectangle_fill_info_tab(Object_t *obj, gpointer data)
gtk_spin_button_set_value(GTK_SPIN_BUTTON(props->y), rectangle->y);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(props->width), rectangle->width);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(props->height),
- rectangle->height);
+ rectangle->height);
}
static void
@@ -461,7 +461,7 @@ rectangle_write_csim(Object_t *obj, gpointer param, OutputFunc_t output)
{
Rectangle_t *rectangle = ObjectToRectangle(obj);
output(param, "\"rect\" coords=\"%d,%d,%d,%d\"", rectangle->x, rectangle->y,
- rectangle->x + rectangle->width, rectangle->y + rectangle->height);
+ rectangle->x + rectangle->width, rectangle->y + rectangle->height);
}
static void
@@ -469,7 +469,7 @@ rectangle_write_cern(Object_t *obj, gpointer param, OutputFunc_t output)
{
Rectangle_t *rectangle = ObjectToRectangle(obj);
output(param, "rect (%d,%d) (%d,%d)", rectangle->x, rectangle->y,
- rectangle->x + rectangle->width, rectangle->y + rectangle->height);
+ rectangle->x + rectangle->width, rectangle->y + rectangle->height);
}
static void
@@ -477,8 +477,8 @@ rectangle_write_ncsa(Object_t *obj, gpointer param, OutputFunc_t output)
{
Rectangle_t *rectangle = ObjectToRectangle(obj);
output(param, "rect %s %d,%d %d,%d", obj->url,
- rectangle->x, rectangle->y,
- rectangle->x + rectangle->width, rectangle->y + rectangle->height);
+ rectangle->x, rectangle->y,
+ rectangle->x + rectangle->width, rectangle->y + rectangle->height);
}
static const gchar*
@@ -518,18 +518,18 @@ rectangle_factory_set_xy(Object_t *obj, guint state, gint x, gint y)
gint width = abs(rectangle->width);
gint height = abs(rectangle->height);
if (width < height)
- rectangle->height = (rectangle->height < 0) ? -width : width;
+ rectangle->height = (rectangle->height < 0) ? -width : width;
else
- rectangle->width = (rectangle->width < 0) ? -height : height;
+ rectangle->width = (rectangle->width < 0) ? -height : height;
}
main_set_dimension(rectangle->width, rectangle->height);
}
static ObjectFactory_t rectangle_factory = {
- NULL, /* Object pointer */
+ NULL, /* Object pointer */
rectangle_factory_finish,
- NULL, /* Cancel func */
+ NULL, /* Cancel func */
rectangle_factory_create_object,
rectangle_factory_set_xy
};
diff --git a/plug-ins/imagemap/imap_selection.c b/plug-ins/imagemap/imap_selection.c
index 35f35b0..c78e7a2 100644
--- a/plug-ins/imagemap/imap_selection.c
+++ b/plug-ins/imagemap/imap_selection.c
@@ -90,17 +90,17 @@ button_press_cb(GtkWidget *widget, GdkEventButton *event, Selection_t *data)
data->doubleclick = FALSE;
if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget),
- (gint) event->x, (gint) event->y,
- &path, NULL, NULL, NULL)) {
- GtkTreeIter iter;
-
- if (gtk_tree_model_get_iter (GTK_TREE_MODEL (data->store), &iter,
- path)) {
- Object_t *obj;
- gtk_tree_model_get (GTK_TREE_MODEL(data->store), &iter, 0, &obj, -1);
- object_edit (obj, TRUE);
- }
- gtk_tree_path_free (path);
+ (gint) event->x, (gint) event->y,
+ &path, NULL, NULL, NULL)) {
+ GtkTreeIter iter;
+
+ if (gtk_tree_model_get_iter (GTK_TREE_MODEL (data->store), &iter,
+ path)) {
+ Object_t *obj;
+ gtk_tree_model_get (GTK_TREE_MODEL(data->store), &iter, 0, &obj, -1);
+ object_edit (obj, TRUE);
+ }
+ gtk_tree_path_free (path);
}
} else {
data->doubleclick = TRUE;
@@ -123,7 +123,7 @@ selection_set_selected(Selection_t *selection, gint row)
GtkTreeIter iter;
if (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (selection->store), &iter,
- NULL, row)) {
+ NULL, row)) {
Object_t *obj;
gtk_tree_model_get (GTK_TREE_MODEL(selection->store), &iter, 0, &obj, -1);
@@ -156,20 +156,20 @@ object_added_cb(Object_t *obj, gpointer data)
static gboolean
selection_find_object(Selection_t *selection, Object_t *lookup,
- GtkTreeIter *iter)
+ GtkTreeIter *iter)
{
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (selection->store),
- iter)) {
+ iter)) {
do {
Object_t *obj;
gtk_tree_model_get (GTK_TREE_MODEL(selection->store), iter, 0,
- &obj, -1);
+ &obj, -1);
if (obj == lookup)
- return TRUE;
+ return TRUE;
} while (gtk_tree_model_iter_next (GTK_TREE_MODEL (selection->store),
- iter));
+ iter));
}
return FALSE;
}
@@ -185,7 +185,7 @@ object_updated_cb(Object_t *obj, gpointer data)
path = gtk_tree_model_get_path (GTK_TREE_MODEL (selection->store), &iter);
gtk_tree_model_row_changed (GTK_TREE_MODEL (selection->store), path,
- &iter);
+ &iter);
}
}
@@ -231,7 +231,7 @@ selection_get_object (GtkTreeModel *tree_model, GtkTreeIter *iter)
static void
handle_drop(GtkWidget *widget, GdkDragContext *context, gint x, gint y,
- GtkSelectionData *data, guint info, guint time)
+ GtkSelectionData *data, guint info, guint time)
{
gboolean success = FALSE;
@@ -266,7 +266,7 @@ handle_drop(GtkWidget *widget, GdkDragContext *context, gint x, gint y,
static void
render_image (GtkTreeViewColumn *column, GtkCellRenderer *cell,
- GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
+ GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
Object_t *obj = selection_get_object (tree_model, iter);
g_object_set(cell, "stock-id", object_get_stock_icon_name(obj), NULL);
@@ -274,7 +274,7 @@ render_image (GtkTreeViewColumn *column, GtkCellRenderer *cell,
static void
render_nr (GtkTreeViewColumn *column, GtkCellRenderer *cell,
- GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
+ GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
Object_t *obj = selection_get_object (tree_model, iter);
gchar *scratch;
@@ -286,7 +286,7 @@ render_nr (GtkTreeViewColumn *column, GtkCellRenderer *cell,
static void
render_url (GtkTreeViewColumn *column, GtkCellRenderer *cell,
- GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
+ GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
Object_t *obj = selection_get_object (tree_model, iter);
g_object_set (cell, "text", obj->url, NULL);
@@ -294,7 +294,7 @@ render_url (GtkTreeViewColumn *column, GtkCellRenderer *cell,
static void
render_target (GtkTreeViewColumn *column, GtkCellRenderer *cell,
- GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
+ GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
Object_t *obj = selection_get_object (tree_model, iter);
g_object_set (cell, "text", obj->target, NULL);
@@ -302,7 +302,7 @@ render_target (GtkTreeViewColumn *column, GtkCellRenderer *cell,
static void
render_comment (GtkTreeViewColumn *column, GtkCellRenderer *cell,
- GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
+ GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
Object_t *obj = selection_get_object (tree_model, iter);
g_object_set (cell, "text", obj->comment, NULL);
@@ -348,10 +348,10 @@ make_selection(ObjectList_t *object_list)
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (N_("#"),
- renderer,
- NULL);
+ renderer,
+ NULL);
gtk_tree_view_column_set_cell_data_func (column, renderer,
- render_nr, data, NULL);
+ render_nr, data, NULL);
gtk_tree_view_column_set_min_width (column, 16);
gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
gtk_tree_view_column_set_alignment (column, 0.5);
@@ -363,12 +363,12 @@ make_selection(ObjectList_t *object_list)
renderer = gtk_cell_renderer_pixbuf_new ();
gtk_tree_view_column_pack_start(column, renderer, FALSE);
gtk_tree_view_column_set_cell_data_func (column, renderer,
- render_image, data, NULL);
+ render_image, data, NULL);
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_column_pack_start (column, renderer, TRUE);
gtk_tree_view_column_set_cell_data_func (column, renderer, render_url, data,
- NULL);
+ NULL);
gtk_tree_view_column_set_min_width (column, 80);
gtk_tree_view_column_set_resizable (column, TRUE);
gtk_tree_view_column_set_alignment (column, 0.5);
@@ -377,9 +377,9 @@ make_selection(ObjectList_t *object_list)
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("ALT Text"), renderer,
- NULL);
+ NULL);
gtk_tree_view_column_set_cell_data_func (column, renderer, render_comment,
- data, NULL);
+ data, NULL);
gtk_tree_view_column_set_min_width (column, 64);
gtk_tree_view_column_set_resizable (column, TRUE);
gtk_tree_view_column_set_alignment (column, 0.5);
@@ -387,9 +387,9 @@ make_selection(ObjectList_t *object_list)
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("Target"), renderer,
- NULL);
+ NULL);
gtk_tree_view_column_set_cell_data_func (column, renderer,
- render_target, data, NULL);
+ render_target, data, NULL);
gtk_tree_view_column_set_min_width (column, 64);
gtk_tree_view_column_set_resizable (column, TRUE);
gtk_tree_view_column_set_alignment (column, 0.5);
@@ -407,15 +407,15 @@ make_selection(ObjectList_t *object_list)
/* Drop support */
gtk_drag_dest_set (list, GTK_DEST_DEFAULT_ALL, target_table, 2,
- GDK_ACTION_COPY);
+ GDK_ACTION_COPY);
g_signal_connect (list, "drag-data-received", G_CALLBACK(handle_drop), NULL);
/* For handling doubleclick */
g_signal_connect (list, "button-press-event",
- G_CALLBACK(button_press_cb), data);
+ G_CALLBACK(button_press_cb), data);
g_signal_connect (list, "button-release-event",
- G_CALLBACK(button_release_cb), data);
+ G_CALLBACK(button_release_cb), data);
/* Callbacks we are interested in */
data->selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (list));
diff --git a/plug-ins/imagemap/imap_selection.h b/plug-ins/imagemap/imap_selection.h
index 4de3c35..c81bc40 100644
--- a/plug-ins/imagemap/imap_selection.h
+++ b/plug-ins/imagemap/imap_selection.h
@@ -27,18 +27,18 @@
#include "imap_object.h"
typedef struct {
- GtkListStore *store;
- GtkTreeSelection *selection;
+ GtkListStore *store;
+ GtkTreeSelection *selection;
GtkWidget *container;
GtkWidget *list;
GtkWidget *selected_child;
ObjectList_t *object_list;
- gint selected_row;
- gint nr_rows;
- gboolean is_visible;
- gboolean select_lock;
- gboolean doubleclick;
+ gint selected_row;
+ gint nr_rows;
+ gboolean is_visible;
+ gboolean select_lock;
+ gboolean doubleclick;
CommandFactory_t cmd_move_up;
CommandFactory_t cmd_move_down;
@@ -52,13 +52,13 @@ void selection_freeze(Selection_t *selection);
void selection_thaw(Selection_t *selection);
#define selection_set_move_up_command(selection, command) \
- ((selection)->cmd_move_up = (command))
+ ((selection)->cmd_move_up = (command))
#define selection_set_move_down_command(selection, command) \
- ((selection)->cmd_move_down = (command))
+ ((selection)->cmd_move_down = (command))
#define selection_set_delete_command(selection, command) \
- ((selection)->cmd_delete = (command))
+ ((selection)->cmd_delete = (command))
#define selection_set_edit_command(selection, command) \
- ((selection)->cmd_edit = (command))
+ ((selection)->cmd_edit = (command))
#endif /* _IMAP_SELECTION_H */
diff --git a/plug-ins/imagemap/imap_settings.c b/plug-ins/imagemap/imap_settings.c
index 7b012eb..a17eb52 100644
--- a/plug-ins/imagemap/imap_settings.c
+++ b/plug-ins/imagemap/imap_settings.c
@@ -37,13 +37,13 @@
typedef struct {
DefaultDialog_t *dialog;
BrowseWidget_t *imagename;
- GtkWidget *filename;
- GtkWidget *title;
- GtkWidget *author;
- GtkWidget *default_url;
- GtkWidget *ncsa;
- GtkWidget *cern;
- GtkWidget *csim;
+ GtkWidget *filename;
+ GtkWidget *title;
+ GtkWidget *author;
+ GtkWidget *default_url;
+ GtkWidget *ncsa;
+ GtkWidget *cern;
+ GtkWidget *csim;
GtkTextBuffer *description;
} SettingsDialog_t;
@@ -62,10 +62,10 @@ settings_ok_cb(gpointer data)
g_strreplace(&info->title, gtk_entry_get_text(GTK_ENTRY(param->title)));
g_strreplace(&info->author, gtk_entry_get_text(GTK_ENTRY(param->author)));
g_strreplace(&info->default_url,
- gtk_entry_get_text(GTK_ENTRY(param->default_url)));
+ gtk_entry_get_text(GTK_ENTRY(param->default_url)));
gtk_text_buffer_get_bounds(param->description, &start, &end);
description = gtk_text_buffer_get_text(param->description, &start, &end,
- FALSE);
+ FALSE);
g_strreplace(&info->description, description);
g_free(description);
@@ -96,7 +96,7 @@ create_settings_dialog(void)
create_label_in_table(table, 1, 0, _("Image name:"));
data->imagename = browse_widget_new(_("Select Image File"));
gtk_table_attach_defaults(GTK_TABLE(table), data->imagename->hbox, 1, 2,
- 1, 2);
+ 1, 2);
label = create_label_in_table(table, 2, 0, _("_Title:"));
data->title = create_entry_in_table(table, label, 2, 1);
@@ -116,13 +116,13 @@ create_settings_dialog(void)
swin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin),
- GTK_SHADOW_IN);
+ GTK_SHADOW_IN);
gtk_table_attach(GTK_TABLE(table), swin, 1, 2, 5, 8,
- GTK_EXPAND | GTK_SHRINK | GTK_FILL,
- GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL,
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin),
- GTK_POLICY_NEVER,
- GTK_POLICY_AUTOMATIC);
+ GTK_POLICY_NEVER,
+ GTK_POLICY_AUTOMATIC);
gtk_widget_show(swin);
gtk_container_add(GTK_CONTAINER(swin), view);
@@ -135,21 +135,21 @@ create_settings_dialog(void)
data->ncsa = gtk_radio_button_new_with_mnemonic_from_widget(NULL, "_NCSA");
g_signal_connect(data->ncsa, "toggled",
- G_CALLBACK(type_toggled_cb), (gpointer) NCSA);
+ G_CALLBACK(type_toggled_cb), (gpointer) NCSA);
gtk_box_pack_start(GTK_BOX(hbox), data->ncsa, FALSE, FALSE, 0);
gtk_widget_show(data->ncsa);
data->cern = gtk_radio_button_new_with_mnemonic_from_widget(
GTK_RADIO_BUTTON(data->ncsa), "C_ERN");
g_signal_connect(data->cern, "toggled",
- G_CALLBACK(type_toggled_cb), (gpointer) CERN);
+ G_CALLBACK(type_toggled_cb), (gpointer) CERN);
gtk_box_pack_start(GTK_BOX(hbox), data->cern, FALSE, FALSE, 0);
gtk_widget_show(data->cern);
data->csim = gtk_radio_button_new_with_mnemonic_from_widget(
GTK_RADIO_BUTTON(data->cern), "C_SIM");
g_signal_connect(data->csim, "toggled",
- G_CALLBACK(type_toggled_cb), (gpointer) CSIM);
+ G_CALLBACK(type_toggled_cb), (gpointer) CSIM);
gtk_box_pack_start(GTK_BOX(hbox), data->csim, FALSE, FALSE, 0);
gtk_widget_show(data->csim);
diff --git a/plug-ins/imagemap/imap_source.c b/plug-ins/imagemap/imap_source.c
index 73e7756..457fb6f 100644
--- a/plug-ins/imagemap/imap_source.c
+++ b/plug-ins/imagemap/imap_source.c
@@ -75,12 +75,12 @@ do_source_dialog(void)
swin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin),
- GTK_SHADOW_IN);
+ GTK_SHADOW_IN);
gtk_widget_set_size_request(swin, 400, 300);
gtk_box_pack_start(GTK_BOX(dialog->vbox), swin, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_AUTOMATIC);
gtk_widget_show(swin);
gtk_container_add(GTK_CONTAINER(swin), text);
}
diff --git a/plug-ins/imagemap/imap_statusbar.c b/plug-ins/imagemap/imap_statusbar.c
index 05634ae..a11a6c1 100644
--- a/plug-ins/imagemap/imap_statusbar.c
+++ b/plug-ins/imagemap/imap_statusbar.c
@@ -33,8 +33,8 @@
StatusBar_t*
make_statusbar(GtkWidget *main_vbox, GtkWidget *window)
{
- StatusBar_t *statusbar = g_new(StatusBar_t, 1);
- GtkWidget *hbox, *iconw;
+ StatusBar_t *statusbar = g_new(StatusBar_t, 1);
+ GtkWidget *hbox, *iconw;
hbox = gtk_hbox_new(FALSE, 1);
gtk_box_pack_start(GTK_BOX(main_vbox), hbox, FALSE, FALSE, 0);
@@ -48,7 +48,7 @@ make_statusbar(GtkWidget *main_vbox, GtkWidget *window)
/* (x, y) coordinate */
iconw = gtk_image_new_from_stock(IMAP_STOCK_COORD,
- GTK_ICON_SIZE_SMALL_TOOLBAR);
+ GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_box_pack_start(GTK_BOX(hbox), iconw, FALSE, FALSE, 10);
gtk_widget_show(iconw);
@@ -62,7 +62,7 @@ make_statusbar(GtkWidget *main_vbox, GtkWidget *window)
/* Dimension info */
iconw = gtk_image_new_from_stock(IMAP_STOCK_DIMENSION,
- GTK_ICON_SIZE_SMALL_TOOLBAR);
+ GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_box_pack_start(GTK_BOX(hbox), iconw, FALSE, FALSE, 10);
gtk_widget_show(iconw);
@@ -98,8 +98,8 @@ statusbar_set_status(StatusBar_t *statusbar, const gchar *format, ...)
statusbar_clear_status(statusbar);
statusbar->message_id =
- gtk_statusbar_push(GTK_STATUSBAR(statusbar->status),
- statusbar->status_id, scratch);
+ gtk_statusbar_push(GTK_STATUSBAR(statusbar->status),
+ statusbar->status_id, scratch);
}
void
@@ -107,8 +107,8 @@ statusbar_clear_status(StatusBar_t *statusbar)
{
if (statusbar->message_id)
gtk_statusbar_remove(GTK_STATUSBAR(statusbar->status),
- statusbar->status_id,
- statusbar->message_id);
+ statusbar->status_id,
+ statusbar->message_id);
}
void
@@ -147,5 +147,5 @@ statusbar_set_zoom(StatusBar_t *statusbar, gint factor)
sprintf(scratch, "1:%d", factor);
gtk_statusbar_push(GTK_STATUSBAR(statusbar->zoom), statusbar->zoom_id,
- scratch);
+ scratch);
}
diff --git a/plug-ins/imagemap/imap_stock.c b/plug-ins/imagemap/imap_stock.c
index 038eadf..2c66413 100644
--- a/plug-ins/imagemap/imap_stock.c
+++ b/plug-ins/imagemap/imap_stock.c
@@ -32,13 +32,13 @@ static GtkIconFactory *imap_icon_factory = NULL;
static GtkStockItem imap_stock_items[] =
{
- { IMAP_STOCK_CIRCLE, NULL, 0, 0, NULL },
- { IMAP_STOCK_COORD, NULL, 0, 0, NULL },
+ { IMAP_STOCK_CIRCLE, NULL, 0, 0, NULL },
+ { IMAP_STOCK_COORD, NULL, 0, 0, NULL },
{ IMAP_STOCK_DIMENSION, NULL, 0, 0, NULL },
- { IMAP_STOCK_JAVA, NULL, 0, 0, NULL },
- { IMAP_STOCK_POLYGON, NULL, 0, 0, NULL },
- { IMAP_STOCK_RECTANGLE, NULL, 0, 0, NULL },
- { IMAP_STOCK_TO_BACK, NULL, 0, 0, NULL },
+ { IMAP_STOCK_JAVA, NULL, 0, 0, NULL },
+ { IMAP_STOCK_POLYGON, NULL, 0, 0, NULL },
+ { IMAP_STOCK_RECTANGLE, NULL, 0, 0, NULL },
+ { IMAP_STOCK_TO_BACK, NULL, 0, 0, NULL },
{ IMAP_STOCK_TO_FRONT, NULL, 0, 0, NULL }
};
diff --git a/plug-ins/imagemap/imap_table.c b/plug-ins/imagemap/imap_table.c
index f966bf8..35ebebc 100644
--- a/plug-ins/imagemap/imap_table.c
+++ b/plug-ins/imagemap/imap_table.c
@@ -36,7 +36,7 @@ add_widget_to_table(GtkWidget *table, int row, int col, GtkWidget *w)
GtkWidget*
create_spin_button_in_table(GtkWidget *table, GtkWidget *label,
- int row, int col, int value, int min, int max)
+ int row, int col, int value, int min, int max)
{
GtkObject *adj = gtk_adjustment_new(value, min, max, 1, 1, 1);
GtkWidget *button = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1, 0);
@@ -48,7 +48,7 @@ create_spin_button_in_table(GtkWidget *table, GtkWidget *label,
GtkWidget*
create_check_button_in_table(GtkWidget *table, int row, int col,
- const char *text)
+ const char *text)
{
GtkWidget *button = gtk_check_button_new_with_mnemonic(text);
return add_widget_to_table(table, row, col, button);
@@ -56,7 +56,7 @@ create_check_button_in_table(GtkWidget *table, int row, int col,
GtkWidget*
create_radio_button_in_table(GtkWidget *table, GSList *group,
- int row, int col, const char *text)
+ int row, int col, const char *text)
{
GtkWidget *button = gtk_radio_button_new_with_mnemonic(group, text);
return add_widget_to_table(table, row, col, button);
diff --git a/plug-ins/imagemap/imap_table.h b/plug-ins/imagemap/imap_table.h
index 3d4c78d..ee45122 100644
--- a/plug-ins/imagemap/imap_table.h
+++ b/plug-ins/imagemap/imap_table.h
@@ -24,16 +24,16 @@
#define _IMAP_TABLE_H
GtkWidget *create_spin_button_in_table(GtkWidget *table, GtkWidget *label,
- int row, int col,
- int value, int min, int max);
+ int row, int col,
+ int value, int min, int max);
GtkWidget *create_check_button_in_table(GtkWidget *table, int row, int col,
- const char *text);
+ const char *text);
GtkWidget *create_radio_button_in_table(GtkWidget *table, GSList *group,
- int row, int col, const char *text);
+ int row, int col, const char *text);
GtkWidget *create_label_in_table(GtkWidget *table, int row, int col,
- const char *text);
+ const char *text);
GtkWidget *create_entry_in_table(GtkWidget *table, GtkWidget *label, int row,
- int col);
+ int col);
#endif /* _IMAP_TABLE_H */
diff --git a/plug-ins/imagemap/imap_taglist.c b/plug-ins/imagemap/imap_taglist.c
index 827a955..e0d9093 100644
--- a/plug-ins/imagemap/imap_taglist.c
+++ b/plug-ins/imagemap/imap_taglist.c
@@ -109,8 +109,8 @@ taglist_set(TagList_t *tlist, const gchar *name, const gchar *value)
for (p = tlist->list; p; p = p->next) {
tag = (Tag_t*) p->data;
if (!g_ascii_strcasecmp(tag->name, name)) {
- g_strreplace(&tag->value, value);
- return;
+ g_strreplace(&tag->value, value);
+ return;
}
}
/* Tag not found, add a new tag */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
