mirror of
https://gitlab.gnome.org/GNOME/gimp.git
synced 2025-07-03 17:33:25 +00:00
app, plug-ins, libgimp*: clean out all remaining trailing spaces/tabs.
Rather than just discovering them by chance, a simple grep and some search and replace are much more efficient! :-) Cleaning only done on C and automake files.
This commit is contained in:
parent
2781450c3b
commit
8a37c928eb
33 changed files with 15418 additions and 15429 deletions
|
@ -78,7 +78,7 @@ static const GimpUnitDef gimp_unit_defs[GIMP_UNIT_END] =
|
||||||
*/
|
*/
|
||||||
static const GimpUnitDef gimp_unit_percent =
|
static const GimpUnitDef gimp_unit_percent =
|
||||||
{
|
{
|
||||||
FALSE, 0.0, 0, "percent", "%", "%",
|
FALSE, 0.0, 0, "percent", "%", "%",
|
||||||
NC_("singular", "percent"), NC_("plural", "percent")
|
NC_("singular", "percent"), NC_("plural", "percent")
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -120,8 +120,8 @@ inv_show_status (void)
|
||||||
|
|
||||||
if (inv_game_over) {
|
if (inv_game_over) {
|
||||||
t = g_strdup_printf (_("<b>GAME OVER</b> at level %d!"),
|
t = g_strdup_printf (_("<b>GAME OVER</b> at level %d!"),
|
||||||
inv_level+1);
|
inv_level+1);
|
||||||
u = g_strdup_printf ("<big>%s</big>", t);
|
u = g_strdup_printf ("<big>%s</big>", t);
|
||||||
/* Translators: the first and third strings are similar to a
|
/* Translators: the first and third strings are similar to a
|
||||||
* title, and the second string is a small information text.
|
* title, and the second string is a small information text.
|
||||||
* The spaces are there only to separate all the strings, so
|
* The spaces are there only to separate all the strings, so
|
||||||
|
@ -149,7 +149,7 @@ inv_show_status (void)
|
||||||
s = g_strdup_printf (_("%1$s\t%2$s"), w,
|
s = g_strdup_printf (_("%1$s\t%2$s"), w,
|
||||||
_("Left/Right to move, Space to fire, 'p' to pause, 'q' to quit"));
|
_("Left/Right to move, Space to fire, 'p' to pause, 'q' to quit"));
|
||||||
g_free (t);
|
g_free (t);
|
||||||
g_free (u);
|
g_free (u);
|
||||||
g_free (v);
|
g_free (v);
|
||||||
g_free (w);
|
g_free (w);
|
||||||
|
|
||||||
|
@ -215,7 +215,7 @@ inv_do_game_over (void)
|
||||||
GSList *li;
|
GSList *li;
|
||||||
|
|
||||||
inv_game_over = TRUE;
|
inv_game_over = TRUE;
|
||||||
|
|
||||||
for (li = inv_shots; li != NULL; li = li->next) {
|
for (li = inv_shots; li != NULL; li = li->next) {
|
||||||
InvShot *shot = li->data;
|
InvShot *shot = li->data;
|
||||||
shot->good = FALSE;
|
shot->good = FALSE;
|
||||||
|
@ -231,7 +231,7 @@ static GdkPixbuf *
|
||||||
pb_scale (GdkPixbuf *pb, double scale)
|
pb_scale (GdkPixbuf *pb, double scale)
|
||||||
{
|
{
|
||||||
int w, h;
|
int w, h;
|
||||||
|
|
||||||
if (scale == 1.0)
|
if (scale == 1.0)
|
||||||
return (GdkPixbuf *)g_object_ref ((GObject *)pb);
|
return (GdkPixbuf *)g_object_ref ((GObject *)pb);
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -33,7 +33,7 @@ AM_LDFLAGS = \
|
||||||
-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \
|
-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \
|
||||||
-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \
|
-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \
|
||||||
-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \
|
-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \
|
||||||
-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type
|
-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type
|
||||||
|
|
||||||
# Note that we have some duplicate entries here too to work around
|
# Note that we have some duplicate entries here too to work around
|
||||||
# circular dependencies and systems on the same architectural layer as
|
# circular dependencies and systems on the same architectural layer as
|
||||||
|
|
|
@ -110,7 +110,7 @@ gimp_tools_setup_image (GimpTestFixture *fixture,
|
||||||
{
|
{
|
||||||
Gimp *gimp = GIMP (data);
|
Gimp *gimp = GIMP (data);
|
||||||
|
|
||||||
gimp_test_utils_create_image (gimp,
|
gimp_test_utils_create_image (gimp,
|
||||||
GIMP_TEST_IMAGE_WIDTH,
|
GIMP_TEST_IMAGE_WIDTH,
|
||||||
GIMP_TEST_IMAGE_HEIGHT);
|
GIMP_TEST_IMAGE_HEIGHT);
|
||||||
gimp_test_run_mainloop_until_idle ();
|
gimp_test_run_mainloop_until_idle ();
|
||||||
|
|
|
@ -44,7 +44,7 @@ struct _GimpCropOptions
|
||||||
* will resize the image/layer.
|
* will resize the image/layer.
|
||||||
*/
|
*/
|
||||||
gboolean allow_growing;
|
gboolean allow_growing;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -689,7 +689,7 @@ gimp_rectangle_options_get_width_entry (GimpRectangleOptions *rectangle_options)
|
||||||
|
|
||||||
return private->width_entry;
|
return private->width_entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gimp_rectangle_options_fixed_rule_changed:
|
* gimp_rectangle_options_fixed_rule_changed:
|
||||||
* @combo_box:
|
* @combo_box:
|
||||||
|
|
|
@ -11,7 +11,7 @@ tagsdata_DATA = $(tagsdata_data_files)
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
$(tagsdata_DATA) \
|
$(tagsdata_DATA) \
|
||||||
$(tagsdata_in_files) \
|
$(tagsdata_in_files) \
|
||||||
gimp-tags.dtd
|
gimp-tags.dtd
|
||||||
|
|
||||||
DISTCLEANFILES = $(tagsdata_data_files)
|
DISTCLEANFILES = $(tagsdata_data_files)
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@ EXTRA_DIST = \
|
||||||
32x32/gimp.png \
|
32x32/gimp.png \
|
||||||
48x48/gimp.png \
|
48x48/gimp.png \
|
||||||
64x64/gimp.png \
|
64x64/gimp.png \
|
||||||
256x256/gimp.png
|
256x256/gimp.png
|
||||||
|
|
||||||
|
|
||||||
DISTCLEANFILES = $(desktop_files) $(appdata_files)
|
DISTCLEANFILES = $(desktop_files) $(appdata_files)
|
||||||
|
|
|
@ -43,7 +43,7 @@ uninstall-libtool-import-lib:
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if MS_LIB_AVAILABLE
|
if MS_LIB_AVAILABLE
|
||||||
noinst_DATA = gimp-$(GIMP_API_VERSION).lib gimpui-$(GIMP_API_VERSION).lib
|
noinst_DATA = gimp-$(GIMP_API_VERSION).lib gimpui-$(GIMP_API_VERSION).lib
|
||||||
|
|
||||||
install-ms-lib:
|
install-ms-lib:
|
||||||
$(INSTALL) gimp-$(GIMP_API_VERSION).lib $(DESTDIR)$(libdir)
|
$(INSTALL) gimp-$(GIMP_API_VERSION).lib $(DESTDIR)$(libdir)
|
||||||
|
|
|
@ -86,7 +86,7 @@ libgimpthumb_@GIMP_API_VERSION@_la_LDFLAGS = \
|
||||||
|
|
||||||
libgimpthumb_@GIMP_API_VERSION@_la_LIBADD = \
|
libgimpthumb_@GIMP_API_VERSION@_la_LIBADD = \
|
||||||
$(GDK_PIXBUF_LIBS) \
|
$(GDK_PIXBUF_LIBS) \
|
||||||
$(GIO_LIBS)
|
$(GIO_LIBS)
|
||||||
|
|
||||||
|
|
||||||
noinst_PROGRAMS = gimp-thumbnail-list
|
noinst_PROGRAMS = gimp-thumbnail-list
|
||||||
|
|
|
@ -342,7 +342,7 @@ EXTRA_PROGRAMS = \
|
||||||
test-eevl
|
test-eevl
|
||||||
|
|
||||||
|
|
||||||
test_preview_area_SOURCES = test-preview-area.c
|
test_preview_area_SOURCES = test-preview-area.c
|
||||||
|
|
||||||
test_preview_area_LDADD = \
|
test_preview_area_LDADD = \
|
||||||
$(GTK_LIBS) \
|
$(GTK_LIBS) \
|
||||||
|
|
|
@ -111,7 +111,7 @@ typedef struct
|
||||||
|
|
||||||
GimpEevlToken current_token;
|
GimpEevlToken current_token;
|
||||||
const gchar *start_of_current_token;
|
const gchar *start_of_current_token;
|
||||||
|
|
||||||
|
|
||||||
jmp_buf catcher;
|
jmp_buf catcher;
|
||||||
const gchar *error_message;
|
const gchar *error_message;
|
||||||
|
@ -453,7 +453,6 @@ gimp_eevl_lex (GimpEevl *eva)
|
||||||
gimp_eevl_lex_accept_count (eva, 1, s[0]);
|
gimp_eevl_lex_accept_count (eva, 1, s[0]);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
||||||
{
|
{
|
||||||
/* Attempt to parse a numeric value */
|
/* Attempt to parse a numeric value */
|
||||||
gchar *endptr = NULL;
|
gchar *endptr = NULL;
|
||||||
|
@ -557,7 +556,7 @@ gimp_eevl_unit_identifier_size (const gchar *string,
|
||||||
length++;
|
length++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return g_utf8_offset_to_pointer (start, length) - start;
|
return g_utf8_offset_to_pointer (start, length) - start;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1367,7 +1367,7 @@ gimp_size_entry_eevl_unit_resolver (const gchar *identifier,
|
||||||
GimpSizeEntryField *gsef = (GimpSizeEntryField *) data;
|
GimpSizeEntryField *gsef = (GimpSizeEntryField *) data;
|
||||||
gboolean resolve_default_unit = (identifier == NULL);
|
gboolean resolve_default_unit = (identifier == NULL);
|
||||||
GimpUnit unit;
|
GimpUnit unit;
|
||||||
|
|
||||||
g_return_val_if_fail (gsef, FALSE);
|
g_return_val_if_fail (gsef, FALSE);
|
||||||
g_return_val_if_fail (result != NULL, FALSE);
|
g_return_val_if_fail (result != NULL, FALSE);
|
||||||
g_return_val_if_fail (GIMP_IS_SIZE_ENTRY (gsef->gse), FALSE);
|
g_return_val_if_fail (GIMP_IS_SIZE_ENTRY (gsef->gse), FALSE);
|
||||||
|
|
|
@ -394,7 +394,7 @@ run (const gchar *name,
|
||||||
main_colorize (MC_DST_REMAP);
|
main_colorize (MC_DST_REMAP);
|
||||||
status = GIMP_PDB_SUCCESS;
|
status = GIMP_PDB_SUCCESS;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
status = GIMP_PDB_EXECUTION_ERROR;
|
status = GIMP_PDB_EXECUTION_ERROR;
|
||||||
}
|
}
|
||||||
|
|
|
@ -68,7 +68,7 @@ noinst_PROGRAMS = jpegqual
|
||||||
jpegqual_SOURCES = \
|
jpegqual_SOURCES = \
|
||||||
jpeg-quality.c \
|
jpeg-quality.c \
|
||||||
jpeg-quality.h \
|
jpeg-quality.h \
|
||||||
jpegqual.c
|
jpegqual.c
|
||||||
|
|
||||||
jpegqual_LDADD = \
|
jpegqual_LDADD = \
|
||||||
$(JPEG_LIBS) \
|
$(JPEG_LIBS) \
|
||||||
|
|
|
@ -38,7 +38,7 @@ file_psd_SOURCES = \
|
||||||
psd-image-res-load.c \
|
psd-image-res-load.c \
|
||||||
psd-image-res-load.h \
|
psd-image-res-load.h \
|
||||||
psd-layer-res-load.c \
|
psd-layer-res-load.c \
|
||||||
psd-layer-res-load.h
|
psd-layer-res-load.h
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
TODO.txt \
|
TODO.txt \
|
||||||
|
|
|
@ -1209,7 +1209,7 @@ gfig_paint_timeout (gpointer data)
|
||||||
gfig_paint_callback ();
|
gfig_paint_callback ();
|
||||||
|
|
||||||
paint_timeout = 0;
|
paint_timeout = 0;
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@
|
||||||
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
|
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
|
||||||
|
|
||||||
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
|
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
|
||||||
* if you want the limit (max/min) macros for int types.
|
* if you want the limit (max/min) macros for int types.
|
||||||
*/
|
*/
|
||||||
#ifndef __STDC_LIMIT_MACROS
|
#ifndef __STDC_LIMIT_MACROS
|
||||||
#define __STDC_LIMIT_MACROS 1
|
#define __STDC_LIMIT_MACROS 1
|
||||||
|
@ -69,7 +69,7 @@ typedef uint32_t flex_uint32_t;
|
||||||
typedef signed char flex_int8_t;
|
typedef signed char flex_int8_t;
|
||||||
typedef short int flex_int16_t;
|
typedef short int flex_int16_t;
|
||||||
typedef int flex_int32_t;
|
typedef int flex_int32_t;
|
||||||
typedef unsigned char flex_uint8_t;
|
typedef unsigned char flex_uint8_t;
|
||||||
typedef unsigned short int flex_uint16_t;
|
typedef unsigned short int flex_uint16_t;
|
||||||
typedef unsigned int flex_uint32_t;
|
typedef unsigned int flex_uint32_t;
|
||||||
|
|
||||||
|
@ -186,7 +186,7 @@ extern FILE *cern_in, *cern_out;
|
||||||
#define EOB_ACT_LAST_MATCH 2
|
#define EOB_ACT_LAST_MATCH 2
|
||||||
|
|
||||||
#define YY_LESS_LINENO(n)
|
#define YY_LESS_LINENO(n)
|
||||||
|
|
||||||
/* Return all but the first "n" matched characters back to the input stream. */
|
/* Return all but the first "n" matched characters back to the input stream. */
|
||||||
#define yyless(n) \
|
#define yyless(n) \
|
||||||
do \
|
do \
|
||||||
|
@ -243,7 +243,7 @@ struct yy_buffer_state
|
||||||
|
|
||||||
int yy_bs_lineno; /**< The line count. */
|
int yy_bs_lineno; /**< The line count. */
|
||||||
int yy_bs_column; /**< The column count. */
|
int yy_bs_column; /**< The column count. */
|
||||||
|
|
||||||
/* Whether to try to fill the input buffer when we reach the
|
/* Whether to try to fill the input buffer when we reach the
|
||||||
* end of it.
|
* end of it.
|
||||||
*/
|
*/
|
||||||
|
@ -793,7 +793,7 @@ YY_DECL
|
||||||
register yy_state_type yy_current_state;
|
register yy_state_type yy_current_state;
|
||||||
register char *yy_cp, *yy_bp;
|
register char *yy_cp, *yy_bp;
|
||||||
register int yy_act;
|
register int yy_act;
|
||||||
|
|
||||||
#line 46 "imap_cern.l"
|
#line 46 "imap_cern.l"
|
||||||
|
|
||||||
|
|
||||||
|
@ -1253,7 +1253,7 @@ static int yy_get_next_buffer (void)
|
||||||
{
|
{
|
||||||
register yy_state_type yy_current_state;
|
register yy_state_type yy_current_state;
|
||||||
register char *yy_cp;
|
register char *yy_cp;
|
||||||
|
|
||||||
yy_current_state = (yy_start);
|
yy_current_state = (yy_start);
|
||||||
|
|
||||||
for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
|
for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
|
||||||
|
@ -1313,7 +1313,7 @@ static int yy_get_next_buffer (void)
|
||||||
|
|
||||||
{
|
{
|
||||||
int c;
|
int c;
|
||||||
|
|
||||||
*(yy_c_buf_p) = (yy_hold_char);
|
*(yy_c_buf_p) = (yy_hold_char);
|
||||||
|
|
||||||
if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
|
if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
|
||||||
|
@ -1380,12 +1380,12 @@ static int yy_get_next_buffer (void)
|
||||||
|
|
||||||
/** Immediately switch to a different input stream.
|
/** Immediately switch to a different input stream.
|
||||||
* @param input_file A readable stream.
|
* @param input_file A readable stream.
|
||||||
*
|
*
|
||||||
* @note This function does not reset the start condition to @c INITIAL .
|
* @note This function does not reset the start condition to @c INITIAL .
|
||||||
*/
|
*/
|
||||||
void cern_restart (FILE * input_file )
|
void cern_restart (FILE * input_file )
|
||||||
{
|
{
|
||||||
|
|
||||||
if ( ! YY_CURRENT_BUFFER ){
|
if ( ! YY_CURRENT_BUFFER ){
|
||||||
cern_ensure_buffer_stack ();
|
cern_ensure_buffer_stack ();
|
||||||
YY_CURRENT_BUFFER_LVALUE =
|
YY_CURRENT_BUFFER_LVALUE =
|
||||||
|
@ -1398,11 +1398,11 @@ static int yy_get_next_buffer (void)
|
||||||
|
|
||||||
/** Switch to a different input buffer.
|
/** Switch to a different input buffer.
|
||||||
* @param new_buffer The new input buffer.
|
* @param new_buffer The new input buffer.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void cern__switch_to_buffer (YY_BUFFER_STATE new_buffer )
|
void cern__switch_to_buffer (YY_BUFFER_STATE new_buffer )
|
||||||
{
|
{
|
||||||
|
|
||||||
/* TODO. We should be able to replace this entire function body
|
/* TODO. We should be able to replace this entire function body
|
||||||
* with
|
* with
|
||||||
* cern_pop_buffer_state();
|
* cern_pop_buffer_state();
|
||||||
|
@ -1442,13 +1442,13 @@ static void cern__load_buffer_state (void)
|
||||||
/** Allocate and initialize an input buffer state.
|
/** Allocate and initialize an input buffer state.
|
||||||
* @param file A readable stream.
|
* @param file A readable stream.
|
||||||
* @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
|
* @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
|
||||||
*
|
*
|
||||||
* @return the allocated buffer state.
|
* @return the allocated buffer state.
|
||||||
*/
|
*/
|
||||||
YY_BUFFER_STATE cern__create_buffer (FILE * file, int size )
|
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 ) );
|
b = (YY_BUFFER_STATE) cern_alloc(sizeof( struct yy_buffer_state ) );
|
||||||
if ( ! b )
|
if ( ! b )
|
||||||
YY_FATAL_ERROR( "out of dynamic memory in cern__create_buffer()" );
|
YY_FATAL_ERROR( "out of dynamic memory in cern__create_buffer()" );
|
||||||
|
@ -1471,11 +1471,11 @@ static void cern__load_buffer_state (void)
|
||||||
|
|
||||||
/** Destroy the buffer.
|
/** Destroy the buffer.
|
||||||
* @param b a buffer created with cern__create_buffer()
|
* @param b a buffer created with cern__create_buffer()
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void cern__delete_buffer (YY_BUFFER_STATE b )
|
void cern__delete_buffer (YY_BUFFER_STATE b )
|
||||||
{
|
{
|
||||||
|
|
||||||
if ( ! b )
|
if ( ! b )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -1496,7 +1496,7 @@ static void cern__load_buffer_state (void)
|
||||||
|
|
||||||
{
|
{
|
||||||
int oerrno = errno;
|
int oerrno = errno;
|
||||||
|
|
||||||
cern__flush_buffer(b );
|
cern__flush_buffer(b );
|
||||||
|
|
||||||
b->yy_input_file = file;
|
b->yy_input_file = file;
|
||||||
|
@ -1512,13 +1512,13 @@ static void cern__load_buffer_state (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
|
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.
|
/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
|
||||||
* @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
|
* @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void cern__flush_buffer (YY_BUFFER_STATE b )
|
void cern__flush_buffer (YY_BUFFER_STATE b )
|
||||||
{
|
{
|
||||||
|
@ -1547,7 +1547,7 @@ static void cern__load_buffer_state (void)
|
||||||
* the current state. This function will allocate the stack
|
* the current state. This function will allocate the stack
|
||||||
* if necessary.
|
* if necessary.
|
||||||
* @param new_buffer The new state.
|
* @param new_buffer The new state.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void cern_push_buffer_state (YY_BUFFER_STATE new_buffer )
|
void cern_push_buffer_state (YY_BUFFER_STATE new_buffer )
|
||||||
{
|
{
|
||||||
|
@ -1577,7 +1577,7 @@ void cern_push_buffer_state (YY_BUFFER_STATE new_buffer )
|
||||||
|
|
||||||
/** Removes and deletes the top of the stack, if present.
|
/** Removes and deletes the top of the stack, if present.
|
||||||
* The next element becomes the new top.
|
* The next element becomes the new top.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void cern_pop_buffer_state (void)
|
void cern_pop_buffer_state (void)
|
||||||
{
|
{
|
||||||
|
@ -1601,7 +1601,7 @@ void cern_pop_buffer_state (void)
|
||||||
static void cern_ensure_buffer_stack (void)
|
static void cern_ensure_buffer_stack (void)
|
||||||
{
|
{
|
||||||
yy_size_t num_to_alloc;
|
yy_size_t 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
|
/* First allocation is just for 2 elements, since we don't know if this
|
||||||
|
@ -1614,9 +1614,9 @@ static void cern_ensure_buffer_stack (void)
|
||||||
);
|
);
|
||||||
if ( ! (yy_buffer_stack) )
|
if ( ! (yy_buffer_stack) )
|
||||||
YY_FATAL_ERROR( "out of dynamic memory in cern_ensure_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*));
|
memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
|
||||||
|
|
||||||
(yy_buffer_stack_max) = num_to_alloc;
|
(yy_buffer_stack_max) = num_to_alloc;
|
||||||
(yy_buffer_stack_top) = 0;
|
(yy_buffer_stack_top) = 0;
|
||||||
return;
|
return;
|
||||||
|
@ -1644,13 +1644,13 @@ static void cern_ensure_buffer_stack (void)
|
||||||
/** Setup the input buffer state to scan directly from a user-specified character buffer.
|
/** Setup the input buffer state to scan directly from a user-specified character buffer.
|
||||||
* @param base the character buffer
|
* @param base the character buffer
|
||||||
* @param size the size in bytes of the character buffer
|
* @param size the size in bytes of the character buffer
|
||||||
*
|
*
|
||||||
* @return the newly allocated buffer state object.
|
* @return the newly allocated buffer state object.
|
||||||
*/
|
*/
|
||||||
YY_BUFFER_STATE cern__scan_buffer (char * base, yy_size_t size )
|
YY_BUFFER_STATE cern__scan_buffer (char * base, yy_size_t size )
|
||||||
{
|
{
|
||||||
YY_BUFFER_STATE b;
|
YY_BUFFER_STATE b;
|
||||||
|
|
||||||
if ( size < 2 ||
|
if ( size < 2 ||
|
||||||
base[size-2] != YY_END_OF_BUFFER_CHAR ||
|
base[size-2] != YY_END_OF_BUFFER_CHAR ||
|
||||||
base[size-1] != YY_END_OF_BUFFER_CHAR )
|
base[size-1] != YY_END_OF_BUFFER_CHAR )
|
||||||
|
@ -1679,14 +1679,14 @@ YY_BUFFER_STATE cern__scan_buffer (char * base, yy_size_t size )
|
||||||
/** Setup the input buffer state to scan a string. The next call to cern_lex() will
|
/** Setup the input buffer state to scan a string. The next call to cern_lex() will
|
||||||
* scan from a @e copy of @a str.
|
* scan from a @e copy of @a str.
|
||||||
* @param yystr a NUL-terminated string to scan
|
* @param yystr a NUL-terminated string to scan
|
||||||
*
|
*
|
||||||
* @return the newly allocated buffer state object.
|
* @return the newly allocated buffer state object.
|
||||||
* @note If you want to scan bytes that may contain NUL values, then use
|
* @note If you want to scan bytes that may contain NUL values, then use
|
||||||
* cern__scan_bytes() instead.
|
* cern__scan_bytes() instead.
|
||||||
*/
|
*/
|
||||||
YY_BUFFER_STATE cern__scan_string (yyconst char * yystr )
|
YY_BUFFER_STATE cern__scan_string (yyconst char * yystr )
|
||||||
{
|
{
|
||||||
|
|
||||||
return cern__scan_bytes(yystr,strlen(yystr) );
|
return cern__scan_bytes(yystr,strlen(yystr) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1694,7 +1694,7 @@ YY_BUFFER_STATE cern__scan_string (yyconst char * yystr )
|
||||||
* scan from a @e copy of @a bytes.
|
* scan from a @e copy of @a bytes.
|
||||||
* @param yybytes the byte buffer to scan
|
* @param yybytes the byte buffer to scan
|
||||||
* @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
|
* @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
|
||||||
*
|
*
|
||||||
* @return the newly allocated buffer state object.
|
* @return the newly allocated buffer state object.
|
||||||
*/
|
*/
|
||||||
YY_BUFFER_STATE cern__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
|
YY_BUFFER_STATE cern__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
|
||||||
|
@ -1703,7 +1703,7 @@ YY_BUFFER_STATE cern__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_l
|
||||||
char *buf;
|
char *buf;
|
||||||
yy_size_t n;
|
yy_size_t n;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* Get memory for full buffer, including space for trailing EOB's. */
|
/* Get memory for full buffer, including space for trailing EOB's. */
|
||||||
n = _yybytes_len + 2;
|
n = _yybytes_len + 2;
|
||||||
buf = (char *) cern_alloc(n );
|
buf = (char *) cern_alloc(n );
|
||||||
|
@ -1757,16 +1757,16 @@ static void yy_fatal_error (yyconst char* msg )
|
||||||
/* Accessor methods (get/set functions) to struct members. */
|
/* Accessor methods (get/set functions) to struct members. */
|
||||||
|
|
||||||
/** Get the current line number.
|
/** Get the current line number.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
int cern_get_lineno (void)
|
int cern_get_lineno (void)
|
||||||
{
|
{
|
||||||
|
|
||||||
return cern_lineno;
|
return cern_lineno;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Get the input stream.
|
/** Get the input stream.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
FILE *cern_get_in (void)
|
FILE *cern_get_in (void)
|
||||||
{
|
{
|
||||||
|
@ -1774,7 +1774,7 @@ FILE *cern_get_in (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Get the output stream.
|
/** Get the output stream.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
FILE *cern_get_out (void)
|
FILE *cern_get_out (void)
|
||||||
{
|
{
|
||||||
|
@ -1782,7 +1782,7 @@ FILE *cern_get_out (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Get the length of the current token.
|
/** Get the length of the current token.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
yy_size_t cern_get_leng (void)
|
yy_size_t cern_get_leng (void)
|
||||||
{
|
{
|
||||||
|
@ -1790,7 +1790,7 @@ yy_size_t cern_get_leng (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Get the current token.
|
/** Get the current token.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
char *cern_get_text (void)
|
char *cern_get_text (void)
|
||||||
|
@ -1800,18 +1800,18 @@ char *cern_get_text (void)
|
||||||
|
|
||||||
/** Set the current line number.
|
/** Set the current line number.
|
||||||
* @param line_number
|
* @param line_number
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void cern_set_lineno (int line_number )
|
void cern_set_lineno (int line_number )
|
||||||
{
|
{
|
||||||
|
|
||||||
cern_lineno = line_number;
|
cern_lineno = line_number;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Set the input stream. This does not discard the current
|
/** Set the input stream. This does not discard the current
|
||||||
* input buffer.
|
* input buffer.
|
||||||
* @param in_str A readable stream.
|
* @param in_str A readable stream.
|
||||||
*
|
*
|
||||||
* @see cern__switch_to_buffer
|
* @see cern__switch_to_buffer
|
||||||
*/
|
*/
|
||||||
void cern_set_in (FILE * in_str )
|
void cern_set_in (FILE * in_str )
|
||||||
|
@ -1865,7 +1865,6 @@ static int yy_init_globals (void)
|
||||||
/* cern_lex_destroy is for both reentrant and non-reentrant scanners. */
|
/* cern_lex_destroy is for both reentrant and non-reentrant scanners. */
|
||||||
int cern_lex_destroy (void)
|
int cern_lex_destroy (void)
|
||||||
{
|
{
|
||||||
|
|
||||||
/* Pop the buffer stack, destroying each element. */
|
/* Pop the buffer stack, destroying each element. */
|
||||||
while(YY_CURRENT_BUFFER){
|
while(YY_CURRENT_BUFFER){
|
||||||
cern__delete_buffer(YY_CURRENT_BUFFER );
|
cern__delete_buffer(YY_CURRENT_BUFFER );
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
/* A Bison parser, made by GNU Bison 2.6.1. */
|
/* A Bison parser, made by GNU Bison 2.6.1. */
|
||||||
|
|
||||||
/* Bison implementation for Yacc-like parsers in C
|
/* Bison implementation for Yacc-like parsers in C
|
||||||
|
|
||||||
Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
|
Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
This program is free software: you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
(at your option) any later version.
|
(at your option) any later version.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
special exception, which will cause the skeleton and the resulting
|
special exception, which will cause the skeleton and the resulting
|
||||||
Bison output files to be licensed under the GNU General Public
|
Bison output files to be licensed under the GNU General Public
|
||||||
License without this special exception.
|
License without this special exception.
|
||||||
|
|
||||||
This special exception was added by the Free Software Foundation in
|
This special exception was added by the Free Software Foundation in
|
||||||
version 2.2 of Bison. */
|
version 2.2 of Bison. */
|
||||||
|
|
||||||
|
@ -1526,7 +1526,7 @@ yyreduce:
|
||||||
{
|
{
|
||||||
Polygon_t *polygon = ObjectToPolygon(current_object);
|
Polygon_t *polygon = ObjectToPolygon(current_object);
|
||||||
GdkPoint *point = new_point((gint) (yyvsp[(2) - (5)].value), (gint) (yyvsp[(4) - (5)].value));
|
GdkPoint *point = new_point((gint) (yyvsp[(2) - (5)].value), (gint) (yyvsp[(4) - (5)].value));
|
||||||
polygon->points = g_list_append(polygon->points,
|
polygon->points = g_list_append(polygon->points,
|
||||||
(gpointer) point);
|
(gpointer) point);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -1556,7 +1556,7 @@ yyreduce:
|
||||||
MapInfo_t *info = get_map_info();
|
MapInfo_t *info = get_map_info();
|
||||||
gchar *description;
|
gchar *description;
|
||||||
|
|
||||||
description = g_strconcat(info->description, (yyvsp[(2) - (2)].id), "\n",
|
description = g_strconcat(info->description, (yyvsp[(2) - (2)].id), "\n",
|
||||||
NULL);
|
NULL);
|
||||||
g_strreplace(&info->description, description);
|
g_strreplace(&info->description, description);
|
||||||
g_free ((yyvsp[(2) - (2)].id));
|
g_free ((yyvsp[(2) - (2)].id));
|
||||||
|
@ -1798,7 +1798,7 @@ yyreturn:
|
||||||
#line 162 "imap_cern.y"
|
#line 162 "imap_cern.y"
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
cern_error(char* s)
|
cern_error(char* s)
|
||||||
{
|
{
|
||||||
extern FILE *cern_in;
|
extern FILE *cern_in;
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
/* A Bison parser, made by GNU Bison 2.6.1. */
|
/* A Bison parser, made by GNU Bison 2.6.1. */
|
||||||
|
|
||||||
/* Bison interface for Yacc-like parsers in C
|
/* Bison interface for Yacc-like parsers in C
|
||||||
|
|
||||||
Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
|
Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
This program is free software: you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
(at your option) any later version.
|
(at your option) any later version.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
special exception, which will cause the skeleton and the resulting
|
special exception, which will cause the skeleton and the resulting
|
||||||
Bison output files to be licensed under the GNU General Public
|
Bison output files to be licensed under the GNU General Public
|
||||||
License without this special exception.
|
License without this special exception.
|
||||||
|
|
||||||
This special exception was added by the Free Software Foundation in
|
This special exception was added by the Free Software Foundation in
|
||||||
version 2.2 of Bison. */
|
version 2.2 of Bison. */
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@
|
||||||
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
|
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
|
||||||
|
|
||||||
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
|
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
|
||||||
* if you want the limit (max/min) macros for int types.
|
* if you want the limit (max/min) macros for int types.
|
||||||
*/
|
*/
|
||||||
#ifndef __STDC_LIMIT_MACROS
|
#ifndef __STDC_LIMIT_MACROS
|
||||||
#define __STDC_LIMIT_MACROS 1
|
#define __STDC_LIMIT_MACROS 1
|
||||||
|
@ -69,7 +69,7 @@ typedef uint32_t flex_uint32_t;
|
||||||
typedef signed char flex_int8_t;
|
typedef signed char flex_int8_t;
|
||||||
typedef short int flex_int16_t;
|
typedef short int flex_int16_t;
|
||||||
typedef int flex_int32_t;
|
typedef int flex_int32_t;
|
||||||
typedef unsigned char flex_uint8_t;
|
typedef unsigned char flex_uint8_t;
|
||||||
typedef unsigned short int flex_uint16_t;
|
typedef unsigned short int flex_uint16_t;
|
||||||
typedef unsigned int flex_uint32_t;
|
typedef unsigned int flex_uint32_t;
|
||||||
|
|
||||||
|
@ -186,7 +186,7 @@ extern FILE *csim_in, *csim_out;
|
||||||
#define EOB_ACT_LAST_MATCH 2
|
#define EOB_ACT_LAST_MATCH 2
|
||||||
|
|
||||||
#define YY_LESS_LINENO(n)
|
#define YY_LESS_LINENO(n)
|
||||||
|
|
||||||
/* Return all but the first "n" matched characters back to the input stream. */
|
/* Return all but the first "n" matched characters back to the input stream. */
|
||||||
#define yyless(n) \
|
#define yyless(n) \
|
||||||
do \
|
do \
|
||||||
|
@ -243,7 +243,7 @@ struct yy_buffer_state
|
||||||
|
|
||||||
int yy_bs_lineno; /**< The line count. */
|
int yy_bs_lineno; /**< The line count. */
|
||||||
int yy_bs_column; /**< The column count. */
|
int yy_bs_column; /**< The column count. */
|
||||||
|
|
||||||
/* Whether to try to fill the input buffer when we reach the
|
/* Whether to try to fill the input buffer when we reach the
|
||||||
* end of it.
|
* end of it.
|
||||||
*/
|
*/
|
||||||
|
@ -818,7 +818,7 @@ YY_DECL
|
||||||
register yy_state_type yy_current_state;
|
register yy_state_type yy_current_state;
|
||||||
register char *yy_cp, *yy_bp;
|
register char *yy_cp, *yy_bp;
|
||||||
register int yy_act;
|
register int yy_act;
|
||||||
|
|
||||||
#line 47 "imap_csim.l"
|
#line 47 "imap_csim.l"
|
||||||
|
|
||||||
|
|
||||||
|
@ -1375,7 +1375,7 @@ static int yy_get_next_buffer (void)
|
||||||
{
|
{
|
||||||
register yy_state_type yy_current_state;
|
register yy_state_type yy_current_state;
|
||||||
register char *yy_cp;
|
register char *yy_cp;
|
||||||
|
|
||||||
yy_current_state = (yy_start);
|
yy_current_state = (yy_start);
|
||||||
|
|
||||||
for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
|
for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
|
||||||
|
@ -1435,7 +1435,7 @@ static int yy_get_next_buffer (void)
|
||||||
|
|
||||||
{
|
{
|
||||||
int c;
|
int c;
|
||||||
|
|
||||||
*(yy_c_buf_p) = (yy_hold_char);
|
*(yy_c_buf_p) = (yy_hold_char);
|
||||||
|
|
||||||
if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
|
if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
|
||||||
|
@ -1502,12 +1502,11 @@ static int yy_get_next_buffer (void)
|
||||||
|
|
||||||
/** Immediately switch to a different input stream.
|
/** Immediately switch to a different input stream.
|
||||||
* @param input_file A readable stream.
|
* @param input_file A readable stream.
|
||||||
*
|
*
|
||||||
* @note This function does not reset the start condition to @c INITIAL .
|
* @note This function does not reset the start condition to @c INITIAL .
|
||||||
*/
|
*/
|
||||||
void csim_restart (FILE * input_file )
|
void csim_restart (FILE * input_file )
|
||||||
{
|
{
|
||||||
|
|
||||||
if ( ! YY_CURRENT_BUFFER ){
|
if ( ! YY_CURRENT_BUFFER ){
|
||||||
csim_ensure_buffer_stack ();
|
csim_ensure_buffer_stack ();
|
||||||
YY_CURRENT_BUFFER_LVALUE =
|
YY_CURRENT_BUFFER_LVALUE =
|
||||||
|
@ -1520,11 +1519,10 @@ static int yy_get_next_buffer (void)
|
||||||
|
|
||||||
/** Switch to a different input buffer.
|
/** Switch to a different input buffer.
|
||||||
* @param new_buffer The new input buffer.
|
* @param new_buffer The new input buffer.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void csim__switch_to_buffer (YY_BUFFER_STATE new_buffer )
|
void csim__switch_to_buffer (YY_BUFFER_STATE new_buffer )
|
||||||
{
|
{
|
||||||
|
|
||||||
/* TODO. We should be able to replace this entire function body
|
/* TODO. We should be able to replace this entire function body
|
||||||
* with
|
* with
|
||||||
* csim_pop_buffer_state();
|
* csim_pop_buffer_state();
|
||||||
|
@ -1564,13 +1562,13 @@ static void csim__load_buffer_state (void)
|
||||||
/** Allocate and initialize an input buffer state.
|
/** Allocate and initialize an input buffer state.
|
||||||
* @param file A readable stream.
|
* @param file A readable stream.
|
||||||
* @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
|
* @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
|
||||||
*
|
*
|
||||||
* @return the allocated buffer state.
|
* @return the allocated buffer state.
|
||||||
*/
|
*/
|
||||||
YY_BUFFER_STATE csim__create_buffer (FILE * file, int size )
|
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 ) );
|
b = (YY_BUFFER_STATE) csim_alloc(sizeof( struct yy_buffer_state ) );
|
||||||
if ( ! b )
|
if ( ! b )
|
||||||
YY_FATAL_ERROR( "out of dynamic memory in csim__create_buffer()" );
|
YY_FATAL_ERROR( "out of dynamic memory in csim__create_buffer()" );
|
||||||
|
@ -1593,11 +1591,10 @@ static void csim__load_buffer_state (void)
|
||||||
|
|
||||||
/** Destroy the buffer.
|
/** Destroy the buffer.
|
||||||
* @param b a buffer created with csim__create_buffer()
|
* @param b a buffer created with csim__create_buffer()
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void csim__delete_buffer (YY_BUFFER_STATE b )
|
void csim__delete_buffer (YY_BUFFER_STATE b )
|
||||||
{
|
{
|
||||||
|
|
||||||
if ( ! b )
|
if ( ! b )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -1618,7 +1615,7 @@ static void csim__load_buffer_state (void)
|
||||||
|
|
||||||
{
|
{
|
||||||
int oerrno = errno;
|
int oerrno = errno;
|
||||||
|
|
||||||
csim__flush_buffer(b );
|
csim__flush_buffer(b );
|
||||||
|
|
||||||
b->yy_input_file = file;
|
b->yy_input_file = file;
|
||||||
|
@ -1634,13 +1631,13 @@ static void csim__load_buffer_state (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
|
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.
|
/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
|
||||||
* @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
|
* @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void csim__flush_buffer (YY_BUFFER_STATE b )
|
void csim__flush_buffer (YY_BUFFER_STATE b )
|
||||||
{
|
{
|
||||||
|
@ -1669,7 +1666,7 @@ static void csim__load_buffer_state (void)
|
||||||
* the current state. This function will allocate the stack
|
* the current state. This function will allocate the stack
|
||||||
* if necessary.
|
* if necessary.
|
||||||
* @param new_buffer The new state.
|
* @param new_buffer The new state.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void csim_push_buffer_state (YY_BUFFER_STATE new_buffer )
|
void csim_push_buffer_state (YY_BUFFER_STATE new_buffer )
|
||||||
{
|
{
|
||||||
|
@ -1699,7 +1696,7 @@ void csim_push_buffer_state (YY_BUFFER_STATE new_buffer )
|
||||||
|
|
||||||
/** Removes and deletes the top of the stack, if present.
|
/** Removes and deletes the top of the stack, if present.
|
||||||
* The next element becomes the new top.
|
* The next element becomes the new top.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void csim_pop_buffer_state (void)
|
void csim_pop_buffer_state (void)
|
||||||
{
|
{
|
||||||
|
@ -1723,7 +1720,7 @@ void csim_pop_buffer_state (void)
|
||||||
static void csim_ensure_buffer_stack (void)
|
static void csim_ensure_buffer_stack (void)
|
||||||
{
|
{
|
||||||
yy_size_t num_to_alloc;
|
yy_size_t 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
|
/* First allocation is just for 2 elements, since we don't know if this
|
||||||
|
@ -1736,9 +1733,9 @@ static void csim_ensure_buffer_stack (void)
|
||||||
);
|
);
|
||||||
if ( ! (yy_buffer_stack) )
|
if ( ! (yy_buffer_stack) )
|
||||||
YY_FATAL_ERROR( "out of dynamic memory in csim_ensure_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*));
|
memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
|
||||||
|
|
||||||
(yy_buffer_stack_max) = num_to_alloc;
|
(yy_buffer_stack_max) = num_to_alloc;
|
||||||
(yy_buffer_stack_top) = 0;
|
(yy_buffer_stack_top) = 0;
|
||||||
return;
|
return;
|
||||||
|
@ -1766,13 +1763,13 @@ static void csim_ensure_buffer_stack (void)
|
||||||
/** Setup the input buffer state to scan directly from a user-specified character buffer.
|
/** Setup the input buffer state to scan directly from a user-specified character buffer.
|
||||||
* @param base the character buffer
|
* @param base the character buffer
|
||||||
* @param size the size in bytes of the character buffer
|
* @param size the size in bytes of the character buffer
|
||||||
*
|
*
|
||||||
* @return the newly allocated buffer state object.
|
* @return the newly allocated buffer state object.
|
||||||
*/
|
*/
|
||||||
YY_BUFFER_STATE csim__scan_buffer (char * base, yy_size_t size )
|
YY_BUFFER_STATE csim__scan_buffer (char * base, yy_size_t size )
|
||||||
{
|
{
|
||||||
YY_BUFFER_STATE b;
|
YY_BUFFER_STATE b;
|
||||||
|
|
||||||
if ( size < 2 ||
|
if ( size < 2 ||
|
||||||
base[size-2] != YY_END_OF_BUFFER_CHAR ||
|
base[size-2] != YY_END_OF_BUFFER_CHAR ||
|
||||||
base[size-1] != YY_END_OF_BUFFER_CHAR )
|
base[size-1] != YY_END_OF_BUFFER_CHAR )
|
||||||
|
@ -1801,14 +1798,13 @@ YY_BUFFER_STATE csim__scan_buffer (char * base, yy_size_t size )
|
||||||
/** Setup the input buffer state to scan a string. The next call to csim_lex() will
|
/** Setup the input buffer state to scan a string. The next call to csim_lex() will
|
||||||
* scan from a @e copy of @a str.
|
* scan from a @e copy of @a str.
|
||||||
* @param yystr a NUL-terminated string to scan
|
* @param yystr a NUL-terminated string to scan
|
||||||
*
|
*
|
||||||
* @return the newly allocated buffer state object.
|
* @return the newly allocated buffer state object.
|
||||||
* @note If you want to scan bytes that may contain NUL values, then use
|
* @note If you want to scan bytes that may contain NUL values, then use
|
||||||
* csim__scan_bytes() instead.
|
* csim__scan_bytes() instead.
|
||||||
*/
|
*/
|
||||||
YY_BUFFER_STATE csim__scan_string (yyconst char * yystr )
|
YY_BUFFER_STATE csim__scan_string (yyconst char * yystr )
|
||||||
{
|
{
|
||||||
|
|
||||||
return csim__scan_bytes(yystr,strlen(yystr) );
|
return csim__scan_bytes(yystr,strlen(yystr) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1816,7 +1812,7 @@ YY_BUFFER_STATE csim__scan_string (yyconst char * yystr )
|
||||||
* scan from a @e copy of @a bytes.
|
* scan from a @e copy of @a bytes.
|
||||||
* @param yybytes the byte buffer to scan
|
* @param yybytes the byte buffer to scan
|
||||||
* @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
|
* @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
|
||||||
*
|
*
|
||||||
* @return the newly allocated buffer state object.
|
* @return the newly allocated buffer state object.
|
||||||
*/
|
*/
|
||||||
YY_BUFFER_STATE csim__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
|
YY_BUFFER_STATE csim__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
|
||||||
|
@ -1825,7 +1821,7 @@ YY_BUFFER_STATE csim__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_l
|
||||||
char *buf;
|
char *buf;
|
||||||
yy_size_t n;
|
yy_size_t n;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* Get memory for full buffer, including space for trailing EOB's. */
|
/* Get memory for full buffer, including space for trailing EOB's. */
|
||||||
n = _yybytes_len + 2;
|
n = _yybytes_len + 2;
|
||||||
buf = (char *) csim_alloc(n );
|
buf = (char *) csim_alloc(n );
|
||||||
|
@ -1879,16 +1875,15 @@ static void yy_fatal_error (yyconst char* msg )
|
||||||
/* Accessor methods (get/set functions) to struct members. */
|
/* Accessor methods (get/set functions) to struct members. */
|
||||||
|
|
||||||
/** Get the current line number.
|
/** Get the current line number.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
int csim_get_lineno (void)
|
int csim_get_lineno (void)
|
||||||
{
|
{
|
||||||
|
|
||||||
return csim_lineno;
|
return csim_lineno;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Get the input stream.
|
/** Get the input stream.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
FILE *csim_get_in (void)
|
FILE *csim_get_in (void)
|
||||||
{
|
{
|
||||||
|
@ -1896,7 +1891,7 @@ FILE *csim_get_in (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Get the output stream.
|
/** Get the output stream.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
FILE *csim_get_out (void)
|
FILE *csim_get_out (void)
|
||||||
{
|
{
|
||||||
|
@ -1904,7 +1899,7 @@ FILE *csim_get_out (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Get the length of the current token.
|
/** Get the length of the current token.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
yy_size_t csim_get_leng (void)
|
yy_size_t csim_get_leng (void)
|
||||||
{
|
{
|
||||||
|
@ -1912,7 +1907,7 @@ yy_size_t csim_get_leng (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Get the current token.
|
/** Get the current token.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
char *csim_get_text (void)
|
char *csim_get_text (void)
|
||||||
|
@ -1922,18 +1917,17 @@ char *csim_get_text (void)
|
||||||
|
|
||||||
/** Set the current line number.
|
/** Set the current line number.
|
||||||
* @param line_number
|
* @param line_number
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void csim_set_lineno (int line_number )
|
void csim_set_lineno (int line_number )
|
||||||
{
|
{
|
||||||
|
|
||||||
csim_lineno = line_number;
|
csim_lineno = line_number;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Set the input stream. This does not discard the current
|
/** Set the input stream. This does not discard the current
|
||||||
* input buffer.
|
* input buffer.
|
||||||
* @param in_str A readable stream.
|
* @param in_str A readable stream.
|
||||||
*
|
*
|
||||||
* @see csim__switch_to_buffer
|
* @see csim__switch_to_buffer
|
||||||
*/
|
*/
|
||||||
void csim_set_in (FILE * in_str )
|
void csim_set_in (FILE * in_str )
|
||||||
|
@ -1987,7 +1981,6 @@ static int yy_init_globals (void)
|
||||||
/* csim_lex_destroy is for both reentrant and non-reentrant scanners. */
|
/* csim_lex_destroy is for both reentrant and non-reentrant scanners. */
|
||||||
int csim_lex_destroy (void)
|
int csim_lex_destroy (void)
|
||||||
{
|
{
|
||||||
|
|
||||||
/* Pop the buffer stack, destroying each element. */
|
/* Pop the buffer stack, destroying each element. */
|
||||||
while(YY_CURRENT_BUFFER){
|
while(YY_CURRENT_BUFFER){
|
||||||
csim__delete_buffer(YY_CURRENT_BUFFER );
|
csim__delete_buffer(YY_CURRENT_BUFFER );
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
/* A Bison parser, made by GNU Bison 2.6.1. */
|
/* A Bison parser, made by GNU Bison 2.6.1. */
|
||||||
|
|
||||||
/* Bison implementation for Yacc-like parsers in C
|
/* Bison implementation for Yacc-like parsers in C
|
||||||
|
|
||||||
Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
|
Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
This program is free software: you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
(at your option) any later version.
|
(at your option) any later version.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
special exception, which will cause the skeleton and the resulting
|
special exception, which will cause the skeleton and the resulting
|
||||||
Bison output files to be licensed under the GNU General Public
|
Bison output files to be licensed under the GNU General Public
|
||||||
License without this special exception.
|
License without this special exception.
|
||||||
|
|
||||||
This special exception was added by the Free Software Foundation in
|
This special exception was added by the Free Software Foundation in
|
||||||
version 2.2 of Bison. */
|
version 2.2 of Bison. */
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@
|
||||||
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
|
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
|
||||||
|
|
||||||
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
|
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
|
||||||
* if you want the limit (max/min) macros for int types.
|
* if you want the limit (max/min) macros for int types.
|
||||||
*/
|
*/
|
||||||
#ifndef __STDC_LIMIT_MACROS
|
#ifndef __STDC_LIMIT_MACROS
|
||||||
#define __STDC_LIMIT_MACROS 1
|
#define __STDC_LIMIT_MACROS 1
|
||||||
|
@ -69,7 +69,7 @@ typedef uint32_t flex_uint32_t;
|
||||||
typedef signed char flex_int8_t;
|
typedef signed char flex_int8_t;
|
||||||
typedef short int flex_int16_t;
|
typedef short int flex_int16_t;
|
||||||
typedef int flex_int32_t;
|
typedef int flex_int32_t;
|
||||||
typedef unsigned char flex_uint8_t;
|
typedef unsigned char flex_uint8_t;
|
||||||
typedef unsigned short int flex_uint16_t;
|
typedef unsigned short int flex_uint16_t;
|
||||||
typedef unsigned int flex_uint32_t;
|
typedef unsigned int flex_uint32_t;
|
||||||
|
|
||||||
|
@ -186,7 +186,7 @@ extern FILE *ncsa_in, *ncsa_out;
|
||||||
#define EOB_ACT_LAST_MATCH 2
|
#define EOB_ACT_LAST_MATCH 2
|
||||||
|
|
||||||
#define YY_LESS_LINENO(n)
|
#define YY_LESS_LINENO(n)
|
||||||
|
|
||||||
/* Return all but the first "n" matched characters back to the input stream. */
|
/* Return all but the first "n" matched characters back to the input stream. */
|
||||||
#define yyless(n) \
|
#define yyless(n) \
|
||||||
do \
|
do \
|
||||||
|
@ -243,7 +243,7 @@ struct yy_buffer_state
|
||||||
|
|
||||||
int yy_bs_lineno; /**< The line count. */
|
int yy_bs_lineno; /**< The line count. */
|
||||||
int yy_bs_column; /**< The column count. */
|
int yy_bs_column; /**< The column count. */
|
||||||
|
|
||||||
/* Whether to try to fill the input buffer when we reach the
|
/* Whether to try to fill the input buffer when we reach the
|
||||||
* end of it.
|
* end of it.
|
||||||
*/
|
*/
|
||||||
|
@ -758,7 +758,7 @@ YY_DECL
|
||||||
register yy_state_type yy_current_state;
|
register yy_state_type yy_current_state;
|
||||||
register char *yy_cp, *yy_bp;
|
register char *yy_cp, *yy_bp;
|
||||||
register int yy_act;
|
register int yy_act;
|
||||||
|
|
||||||
#line 47 "imap_ncsa.l"
|
#line 47 "imap_ncsa.l"
|
||||||
|
|
||||||
|
|
||||||
|
@ -1231,7 +1231,7 @@ static int yy_get_next_buffer (void)
|
||||||
{
|
{
|
||||||
register yy_state_type yy_current_state;
|
register yy_state_type yy_current_state;
|
||||||
register char *yy_cp;
|
register char *yy_cp;
|
||||||
|
|
||||||
yy_current_state = (yy_start);
|
yy_current_state = (yy_start);
|
||||||
|
|
||||||
for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
|
for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
|
||||||
|
@ -1291,7 +1291,7 @@ static int yy_get_next_buffer (void)
|
||||||
|
|
||||||
{
|
{
|
||||||
int c;
|
int c;
|
||||||
|
|
||||||
*(yy_c_buf_p) = (yy_hold_char);
|
*(yy_c_buf_p) = (yy_hold_char);
|
||||||
|
|
||||||
if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
|
if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
|
||||||
|
@ -1358,12 +1358,12 @@ static int yy_get_next_buffer (void)
|
||||||
|
|
||||||
/** Immediately switch to a different input stream.
|
/** Immediately switch to a different input stream.
|
||||||
* @param input_file A readable stream.
|
* @param input_file A readable stream.
|
||||||
*
|
*
|
||||||
* @note This function does not reset the start condition to @c INITIAL .
|
* @note This function does not reset the start condition to @c INITIAL .
|
||||||
*/
|
*/
|
||||||
void ncsa_restart (FILE * input_file )
|
void ncsa_restart (FILE * input_file )
|
||||||
{
|
{
|
||||||
|
|
||||||
if ( ! YY_CURRENT_BUFFER ){
|
if ( ! YY_CURRENT_BUFFER ){
|
||||||
ncsa_ensure_buffer_stack ();
|
ncsa_ensure_buffer_stack ();
|
||||||
YY_CURRENT_BUFFER_LVALUE =
|
YY_CURRENT_BUFFER_LVALUE =
|
||||||
|
@ -1376,11 +1376,11 @@ static int yy_get_next_buffer (void)
|
||||||
|
|
||||||
/** Switch to a different input buffer.
|
/** Switch to a different input buffer.
|
||||||
* @param new_buffer The new input buffer.
|
* @param new_buffer The new input buffer.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void ncsa__switch_to_buffer (YY_BUFFER_STATE new_buffer )
|
void ncsa__switch_to_buffer (YY_BUFFER_STATE new_buffer )
|
||||||
{
|
{
|
||||||
|
|
||||||
/* TODO. We should be able to replace this entire function body
|
/* TODO. We should be able to replace this entire function body
|
||||||
* with
|
* with
|
||||||
* ncsa_pop_buffer_state();
|
* ncsa_pop_buffer_state();
|
||||||
|
@ -1420,13 +1420,13 @@ static void ncsa__load_buffer_state (void)
|
||||||
/** Allocate and initialize an input buffer state.
|
/** Allocate and initialize an input buffer state.
|
||||||
* @param file A readable stream.
|
* @param file A readable stream.
|
||||||
* @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
|
* @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
|
||||||
*
|
*
|
||||||
* @return the allocated buffer state.
|
* @return the allocated buffer state.
|
||||||
*/
|
*/
|
||||||
YY_BUFFER_STATE ncsa__create_buffer (FILE * file, int size )
|
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 ) );
|
b = (YY_BUFFER_STATE) ncsa_alloc(sizeof( struct yy_buffer_state ) );
|
||||||
if ( ! b )
|
if ( ! b )
|
||||||
YY_FATAL_ERROR( "out of dynamic memory in ncsa__create_buffer()" );
|
YY_FATAL_ERROR( "out of dynamic memory in ncsa__create_buffer()" );
|
||||||
|
@ -1449,11 +1449,11 @@ static void ncsa__load_buffer_state (void)
|
||||||
|
|
||||||
/** Destroy the buffer.
|
/** Destroy the buffer.
|
||||||
* @param b a buffer created with ncsa__create_buffer()
|
* @param b a buffer created with ncsa__create_buffer()
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void ncsa__delete_buffer (YY_BUFFER_STATE b )
|
void ncsa__delete_buffer (YY_BUFFER_STATE b )
|
||||||
{
|
{
|
||||||
|
|
||||||
if ( ! b )
|
if ( ! b )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -1474,7 +1474,7 @@ static void ncsa__load_buffer_state (void)
|
||||||
|
|
||||||
{
|
{
|
||||||
int oerrno = errno;
|
int oerrno = errno;
|
||||||
|
|
||||||
ncsa__flush_buffer(b );
|
ncsa__flush_buffer(b );
|
||||||
|
|
||||||
b->yy_input_file = file;
|
b->yy_input_file = file;
|
||||||
|
@ -1490,13 +1490,13 @@ static void ncsa__load_buffer_state (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
|
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.
|
/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
|
||||||
* @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
|
* @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void ncsa__flush_buffer (YY_BUFFER_STATE b )
|
void ncsa__flush_buffer (YY_BUFFER_STATE b )
|
||||||
{
|
{
|
||||||
|
@ -1525,7 +1525,7 @@ static void ncsa__load_buffer_state (void)
|
||||||
* the current state. This function will allocate the stack
|
* the current state. This function will allocate the stack
|
||||||
* if necessary.
|
* if necessary.
|
||||||
* @param new_buffer The new state.
|
* @param new_buffer The new state.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void ncsa_push_buffer_state (YY_BUFFER_STATE new_buffer )
|
void ncsa_push_buffer_state (YY_BUFFER_STATE new_buffer )
|
||||||
{
|
{
|
||||||
|
@ -1555,7 +1555,7 @@ void ncsa_push_buffer_state (YY_BUFFER_STATE new_buffer )
|
||||||
|
|
||||||
/** Removes and deletes the top of the stack, if present.
|
/** Removes and deletes the top of the stack, if present.
|
||||||
* The next element becomes the new top.
|
* The next element becomes the new top.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void ncsa_pop_buffer_state (void)
|
void ncsa_pop_buffer_state (void)
|
||||||
{
|
{
|
||||||
|
@ -1579,7 +1579,7 @@ void ncsa_pop_buffer_state (void)
|
||||||
static void ncsa_ensure_buffer_stack (void)
|
static void ncsa_ensure_buffer_stack (void)
|
||||||
{
|
{
|
||||||
yy_size_t num_to_alloc;
|
yy_size_t 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
|
/* First allocation is just for 2 elements, since we don't know if this
|
||||||
|
@ -1592,9 +1592,9 @@ static void ncsa_ensure_buffer_stack (void)
|
||||||
);
|
);
|
||||||
if ( ! (yy_buffer_stack) )
|
if ( ! (yy_buffer_stack) )
|
||||||
YY_FATAL_ERROR( "out of dynamic memory in ncsa_ensure_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*));
|
memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
|
||||||
|
|
||||||
(yy_buffer_stack_max) = num_to_alloc;
|
(yy_buffer_stack_max) = num_to_alloc;
|
||||||
(yy_buffer_stack_top) = 0;
|
(yy_buffer_stack_top) = 0;
|
||||||
return;
|
return;
|
||||||
|
@ -1622,13 +1622,13 @@ static void ncsa_ensure_buffer_stack (void)
|
||||||
/** Setup the input buffer state to scan directly from a user-specified character buffer.
|
/** Setup the input buffer state to scan directly from a user-specified character buffer.
|
||||||
* @param base the character buffer
|
* @param base the character buffer
|
||||||
* @param size the size in bytes of the character buffer
|
* @param size the size in bytes of the character buffer
|
||||||
*
|
*
|
||||||
* @return the newly allocated buffer state object.
|
* @return the newly allocated buffer state object.
|
||||||
*/
|
*/
|
||||||
YY_BUFFER_STATE ncsa__scan_buffer (char * base, yy_size_t size )
|
YY_BUFFER_STATE ncsa__scan_buffer (char * base, yy_size_t size )
|
||||||
{
|
{
|
||||||
YY_BUFFER_STATE b;
|
YY_BUFFER_STATE b;
|
||||||
|
|
||||||
if ( size < 2 ||
|
if ( size < 2 ||
|
||||||
base[size-2] != YY_END_OF_BUFFER_CHAR ||
|
base[size-2] != YY_END_OF_BUFFER_CHAR ||
|
||||||
base[size-1] != YY_END_OF_BUFFER_CHAR )
|
base[size-1] != YY_END_OF_BUFFER_CHAR )
|
||||||
|
@ -1657,14 +1657,14 @@ YY_BUFFER_STATE ncsa__scan_buffer (char * base, yy_size_t size )
|
||||||
/** Setup the input buffer state to scan a string. The next call to ncsa_lex() will
|
/** Setup the input buffer state to scan a string. The next call to ncsa_lex() will
|
||||||
* scan from a @e copy of @a str.
|
* scan from a @e copy of @a str.
|
||||||
* @param yystr a NUL-terminated string to scan
|
* @param yystr a NUL-terminated string to scan
|
||||||
*
|
*
|
||||||
* @return the newly allocated buffer state object.
|
* @return the newly allocated buffer state object.
|
||||||
* @note If you want to scan bytes that may contain NUL values, then use
|
* @note If you want to scan bytes that may contain NUL values, then use
|
||||||
* ncsa__scan_bytes() instead.
|
* ncsa__scan_bytes() instead.
|
||||||
*/
|
*/
|
||||||
YY_BUFFER_STATE ncsa__scan_string (yyconst char * yystr )
|
YY_BUFFER_STATE ncsa__scan_string (yyconst char * yystr )
|
||||||
{
|
{
|
||||||
|
|
||||||
return ncsa__scan_bytes(yystr,strlen(yystr) );
|
return ncsa__scan_bytes(yystr,strlen(yystr) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1672,7 +1672,7 @@ YY_BUFFER_STATE ncsa__scan_string (yyconst char * yystr )
|
||||||
* scan from a @e copy of @a bytes.
|
* scan from a @e copy of @a bytes.
|
||||||
* @param yybytes the byte buffer to scan
|
* @param yybytes the byte buffer to scan
|
||||||
* @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
|
* @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
|
||||||
*
|
*
|
||||||
* @return the newly allocated buffer state object.
|
* @return the newly allocated buffer state object.
|
||||||
*/
|
*/
|
||||||
YY_BUFFER_STATE ncsa__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
|
YY_BUFFER_STATE ncsa__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
|
||||||
|
@ -1681,7 +1681,7 @@ YY_BUFFER_STATE ncsa__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_l
|
||||||
char *buf;
|
char *buf;
|
||||||
yy_size_t n;
|
yy_size_t n;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* Get memory for full buffer, including space for trailing EOB's. */
|
/* Get memory for full buffer, including space for trailing EOB's. */
|
||||||
n = _yybytes_len + 2;
|
n = _yybytes_len + 2;
|
||||||
buf = (char *) ncsa_alloc(n );
|
buf = (char *) ncsa_alloc(n );
|
||||||
|
@ -1735,16 +1735,16 @@ static void yy_fatal_error (yyconst char* msg )
|
||||||
/* Accessor methods (get/set functions) to struct members. */
|
/* Accessor methods (get/set functions) to struct members. */
|
||||||
|
|
||||||
/** Get the current line number.
|
/** Get the current line number.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
int ncsa_get_lineno (void)
|
int ncsa_get_lineno (void)
|
||||||
{
|
{
|
||||||
|
|
||||||
return ncsa_lineno;
|
return ncsa_lineno;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Get the input stream.
|
/** Get the input stream.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
FILE *ncsa_get_in (void)
|
FILE *ncsa_get_in (void)
|
||||||
{
|
{
|
||||||
|
@ -1752,7 +1752,7 @@ FILE *ncsa_get_in (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Get the output stream.
|
/** Get the output stream.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
FILE *ncsa_get_out (void)
|
FILE *ncsa_get_out (void)
|
||||||
{
|
{
|
||||||
|
@ -1760,7 +1760,7 @@ FILE *ncsa_get_out (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Get the length of the current token.
|
/** Get the length of the current token.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
yy_size_t ncsa_get_leng (void)
|
yy_size_t ncsa_get_leng (void)
|
||||||
{
|
{
|
||||||
|
@ -1768,7 +1768,7 @@ yy_size_t ncsa_get_leng (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Get the current token.
|
/** Get the current token.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
char *ncsa_get_text (void)
|
char *ncsa_get_text (void)
|
||||||
|
@ -1778,18 +1778,18 @@ char *ncsa_get_text (void)
|
||||||
|
|
||||||
/** Set the current line number.
|
/** Set the current line number.
|
||||||
* @param line_number
|
* @param line_number
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void ncsa_set_lineno (int line_number )
|
void ncsa_set_lineno (int line_number )
|
||||||
{
|
{
|
||||||
|
|
||||||
ncsa_lineno = line_number;
|
ncsa_lineno = line_number;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Set the input stream. This does not discard the current
|
/** Set the input stream. This does not discard the current
|
||||||
* input buffer.
|
* input buffer.
|
||||||
* @param in_str A readable stream.
|
* @param in_str A readable stream.
|
||||||
*
|
*
|
||||||
* @see ncsa__switch_to_buffer
|
* @see ncsa__switch_to_buffer
|
||||||
*/
|
*/
|
||||||
void ncsa_set_in (FILE * in_str )
|
void ncsa_set_in (FILE * in_str )
|
||||||
|
@ -1843,7 +1843,6 @@ static int yy_init_globals (void)
|
||||||
/* ncsa_lex_destroy is for both reentrant and non-reentrant scanners. */
|
/* ncsa_lex_destroy is for both reentrant and non-reentrant scanners. */
|
||||||
int ncsa_lex_destroy (void)
|
int ncsa_lex_destroy (void)
|
||||||
{
|
{
|
||||||
|
|
||||||
/* Pop the buffer stack, destroying each element. */
|
/* Pop the buffer stack, destroying each element. */
|
||||||
while(YY_CURRENT_BUFFER){
|
while(YY_CURRENT_BUFFER){
|
||||||
ncsa__delete_buffer(YY_CURRENT_BUFFER );
|
ncsa__delete_buffer(YY_CURRENT_BUFFER );
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
/* A Bison parser, made by GNU Bison 2.6.1. */
|
/* A Bison parser, made by GNU Bison 2.6.1. */
|
||||||
|
|
||||||
/* Bison implementation for Yacc-like parsers in C
|
/* Bison implementation for Yacc-like parsers in C
|
||||||
|
|
||||||
Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
|
Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
This program is free software: you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
(at your option) any later version.
|
(at your option) any later version.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
special exception, which will cause the skeleton and the resulting
|
special exception, which will cause the skeleton and the resulting
|
||||||
Bison output files to be licensed under the GNU General Public
|
Bison output files to be licensed under the GNU General Public
|
||||||
License without this special exception.
|
License without this special exception.
|
||||||
|
|
||||||
This special exception was added by the Free Software Foundation in
|
This special exception was added by the Free Software Foundation in
|
||||||
version 2.2 of Bison. */
|
version 2.2 of Bison. */
|
||||||
|
|
||||||
|
@ -1491,7 +1491,7 @@ yyreduce:
|
||||||
MapInfo_t *info = get_map_info();
|
MapInfo_t *info = get_map_info();
|
||||||
gchar *description;
|
gchar *description;
|
||||||
|
|
||||||
description = g_strconcat(info->description, (yyvsp[(2) - (2)].id), "\n",
|
description = g_strconcat(info->description, (yyvsp[(2) - (2)].id), "\n",
|
||||||
NULL);
|
NULL);
|
||||||
g_strreplace(&info->description, description);
|
g_strreplace(&info->description, description);
|
||||||
g_free ((yyvsp[(2) - (2)].id));
|
g_free ((yyvsp[(2) - (2)].id));
|
||||||
|
@ -1502,7 +1502,7 @@ yyreduce:
|
||||||
/* Line 1787 of yacc.c */
|
/* Line 1787 of yacc.c */
|
||||||
#line 117 "imap_ncsa.y"
|
#line 117 "imap_ncsa.y"
|
||||||
{
|
{
|
||||||
MapInfo_t *info = get_map_info();
|
MapInfo_t *info = get_map_info();
|
||||||
g_strreplace(&info->default_url, (yyvsp[(2) - (2)].id));
|
g_strreplace(&info->default_url, (yyvsp[(2) - (2)].id));
|
||||||
g_free ((yyvsp[(2) - (2)].id));
|
g_free ((yyvsp[(2) - (2)].id));
|
||||||
}
|
}
|
||||||
|
@ -1566,7 +1566,7 @@ yyreduce:
|
||||||
{
|
{
|
||||||
Polygon_t *polygon = ObjectToPolygon(current_object);
|
Polygon_t *polygon = ObjectToPolygon(current_object);
|
||||||
GdkPoint *point = new_point((gint) (yyvsp[(1) - (3)].value), (gint) (yyvsp[(3) - (3)].value));
|
GdkPoint *point = new_point((gint) (yyvsp[(1) - (3)].value), (gint) (yyvsp[(3) - (3)].value));
|
||||||
polygon->points = g_list_append(polygon->points,
|
polygon->points = g_list_append(polygon->points,
|
||||||
(gpointer) point);
|
(gpointer) point);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -1806,7 +1806,7 @@ yyreturn:
|
||||||
#line 173 "imap_ncsa.y"
|
#line 173 "imap_ncsa.y"
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
ncsa_error(char* s)
|
ncsa_error(char* s)
|
||||||
{
|
{
|
||||||
extern FILE *ncsa_in;
|
extern FILE *ncsa_in;
|
||||||
|
|
|
@ -266,7 +266,7 @@ object_draw(Object_t *obj, cairo_t *cr)
|
||||||
fg = &colors->normal_fg;
|
fg = &colors->normal_fg;
|
||||||
bg = &colors->normal_bg;
|
bg = &colors->normal_bg;
|
||||||
}
|
}
|
||||||
|
|
||||||
cairo_save (cr);
|
cairo_save (cr);
|
||||||
gdk_cairo_set_source_color (cr, bg);
|
gdk_cairo_set_source_color (cr, bg);
|
||||||
obj->class->draw(obj, cr);
|
obj->class->draw(obj, cr);
|
||||||
|
|
|
@ -303,7 +303,7 @@ preview_expose(GtkWidget *widget, GdkEventExpose *event)
|
||||||
cairo_clip (cr);
|
cairo_clip (cr);
|
||||||
cairo_set_line_width (cr, 1.);
|
cairo_set_line_width (cr, 1.);
|
||||||
draw_grid (cr, width, height);
|
draw_grid (cr, width, height);
|
||||||
|
|
||||||
draw_shapes (cr);
|
draw_shapes (cr);
|
||||||
|
|
||||||
if (_tmp_obj)
|
if (_tmp_obj)
|
||||||
|
|
|
@ -1682,7 +1682,6 @@ id2vectors(PyObject *self, PyObject *args)
|
||||||
static PyObject *
|
static PyObject *
|
||||||
pygimp_export_image (PyObject *self, PyObject *args, PyObject *kwargs)
|
pygimp_export_image (PyObject *self, PyObject *args, PyObject *kwargs)
|
||||||
{
|
{
|
||||||
|
|
||||||
PyGimpImage *img;
|
PyGimpImage *img;
|
||||||
PyGimpDrawable *drw = NULL;
|
PyGimpDrawable *drw = NULL;
|
||||||
gchar *format_name = NULL;
|
gchar *format_name = NULL;
|
||||||
|
@ -1691,7 +1690,7 @@ pygimp_export_image (PyObject *self, PyObject *args, PyObject *kwargs)
|
||||||
gint32 img_id;
|
gint32 img_id;
|
||||||
gint32 drw_id;
|
gint32 drw_id;
|
||||||
PyObject *return_values;
|
PyObject *return_values;
|
||||||
|
|
||||||
static char *kwlist[] = { "image", "drawable", "format_name", "capabilities", NULL };
|
static char *kwlist[] = { "image", "drawable", "format_name", "capabilities", NULL };
|
||||||
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!|OsI:export_image", kwlist,
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!|OsI:export_image", kwlist,
|
||||||
&PyGimpImage_Type, &img,
|
&PyGimpImage_Type, &img,
|
||||||
|
@ -1705,14 +1704,14 @@ pygimp_export_image (PyObject *self, PyObject *args, PyObject *kwargs)
|
||||||
"a combination of the "
|
"a combination of the "
|
||||||
"EXPORT_CAN_HANDLE_*/EXPORT_NEEDS_ALPHA values. "
|
"EXPORT_CAN_HANDLE_*/EXPORT_NEEDS_ALPHA values. "
|
||||||
"(check developer documentation on the C function "
|
"(check developer documentation on the C function "
|
||||||
"gimp_export_image for details)"
|
"gimp_export_image for details)"
|
||||||
);
|
);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If no drawable is given, assume the active drawable */
|
/* If no drawable is given, assume the active drawable */
|
||||||
if (drw == NULL) {
|
if (drw == NULL) {
|
||||||
drw = (PyGimpDrawable *)PyObject_GetAttrString((PyObject *)img,
|
drw = (PyGimpDrawable *)PyObject_GetAttrString((PyObject *)img,
|
||||||
"active_drawable");
|
"active_drawable");
|
||||||
if ((PyObject *)drw == Py_None) {
|
if ((PyObject *)drw == Py_None) {
|
||||||
PyErr_SetString(PyExc_ValueError,
|
PyErr_SetString(PyExc_ValueError,
|
||||||
|
@ -1724,9 +1723,9 @@ pygimp_export_image (PyObject *self, PyObject *args, PyObject *kwargs)
|
||||||
}
|
}
|
||||||
img_id = img->ID;
|
img_id = img->ID;
|
||||||
drw_id = drw->ID;
|
drw_id = drw->ID;
|
||||||
|
|
||||||
result = gimp_export_image(&img_id, &drw_id, format_name, capabilities);
|
result = gimp_export_image(&img_id, &drw_id, format_name, capabilities);
|
||||||
|
|
||||||
if (img_id != img->ID) {
|
if (img_id != img->ID) {
|
||||||
img = (PyGimpImage *)pygimp_image_new(img_id);
|
img = (PyGimpImage *)pygimp_image_new(img_id);
|
||||||
}
|
}
|
||||||
|
@ -1739,23 +1738,23 @@ pygimp_export_image (PyObject *self, PyObject *args, PyObject *kwargs)
|
||||||
else {
|
else {
|
||||||
Py_INCREF(drw);
|
Py_INCREF(drw);
|
||||||
}
|
}
|
||||||
|
|
||||||
return_values = PyTuple_New(3);
|
return_values = PyTuple_New(3);
|
||||||
PyTuple_SetItem(return_values, 0, PyInt_FromLong(result));
|
PyTuple_SetItem(return_values, 0, PyInt_FromLong(result));
|
||||||
PyTuple_SetItem(return_values, 1, (PyObject *)img);
|
PyTuple_SetItem(return_values, 1, (PyObject *)img);
|
||||||
PyTuple_SetItem(return_values, 2, (PyObject *)drw);
|
PyTuple_SetItem(return_values, 2, (PyObject *)drw);
|
||||||
|
|
||||||
return return_values;
|
return return_values;
|
||||||
}
|
}
|
||||||
|
|
||||||
static PyObject *
|
static PyObject *
|
||||||
pygimp_export_dialog_new (PyObject *self, PyObject *args, PyObject *kwargs)
|
pygimp_export_dialog_new (PyObject *self, PyObject *args, PyObject *kwargs)
|
||||||
{
|
{
|
||||||
gchar *format_name;
|
gchar *format_name;
|
||||||
gchar *role = NULL;
|
gchar *role = NULL;
|
||||||
gchar *help_id = NULL;
|
gchar *help_id = NULL;
|
||||||
GtkWidget *dialog = NULL;
|
GtkWidget *dialog = NULL;
|
||||||
|
|
||||||
static char *kwlist[] = { "format_name", "role", "help_id", NULL };
|
static char *kwlist[] = { "format_name", "role", "help_id", NULL };
|
||||||
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|ss:export_dialog", kwlist,
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|ss:export_dialog", kwlist,
|
||||||
&format_name,
|
&format_name,
|
||||||
|
@ -1766,13 +1765,13 @@ pygimp_export_dialog_new (PyObject *self, PyObject *args, PyObject *kwargs)
|
||||||
if (role == NULL) {
|
if (role == NULL) {
|
||||||
role = "gimp_export_image";
|
role = "gimp_export_image";
|
||||||
}
|
}
|
||||||
|
|
||||||
dialog = gimp_export_dialog_new(format_name, role, help_id);
|
dialog = gimp_export_dialog_new(format_name, role, help_id);
|
||||||
|
|
||||||
/* pyobject_new handles NULL values */
|
/* pyobject_new handles NULL values */
|
||||||
|
|
||||||
return pygobject_new((GObject *)dialog);
|
return pygobject_new((GObject *)dialog);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* No need to expose "gimp_export_dialog_get_content_area",
|
/* No need to expose "gimp_export_dialog_get_content_area",
|
||||||
|
@ -2014,7 +2013,7 @@ initgimp(void)
|
||||||
|
|
||||||
Py_INCREF(&PyGimpLayer_Type);
|
Py_INCREF(&PyGimpLayer_Type);
|
||||||
PyModule_AddObject(m, "Layer", (PyObject *)&PyGimpLayer_Type);
|
PyModule_AddObject(m, "Layer", (PyObject *)&PyGimpLayer_Type);
|
||||||
|
|
||||||
Py_INCREF(&PyGimpGroupLayer_Type);
|
Py_INCREF(&PyGimpGroupLayer_Type);
|
||||||
PyModule_AddObject(m, "GroupLayer", (PyObject *)&PyGimpGroupLayer_Type);
|
PyModule_AddObject(m, "GroupLayer", (PyObject *)&PyGimpGroupLayer_Type);
|
||||||
|
|
||||||
|
|
|
@ -1007,7 +1007,7 @@ drw_get_data(PyGimpDrawable *self, PyObject *args, PyObject *kwargs)
|
||||||
} else if (g_str_has_suffix (format, "u8")) {
|
} else if (g_str_has_suffix (format, "u8")) {
|
||||||
array_data_type = 'B';
|
array_data_type = 'B';
|
||||||
} else {
|
} else {
|
||||||
PyErr_Warn (PyExc_Warning,
|
PyErr_Warn (PyExc_Warning,
|
||||||
"Could not find apropriate data format - returning raw bytes");
|
"Could not find apropriate data format - returning raw bytes");
|
||||||
array_data_type = 'B';
|
array_data_type = 'B';
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,8 +34,8 @@ static PyObject *
|
||||||
item_from_id(PyObject *not_used, PyObject *args)
|
item_from_id(PyObject *not_used, PyObject *args)
|
||||||
{
|
{
|
||||||
gint32 ID;
|
gint32 ID;
|
||||||
|
|
||||||
if (!PyArg_ParseTuple(args, "i", &ID))
|
if (!PyArg_ParseTuple(args, "i", &ID))
|
||||||
return NULL;
|
return NULL;
|
||||||
return pygimp_item_new(ID);
|
return pygimp_item_new(ID);
|
||||||
}
|
}
|
||||||
|
|
|
@ -128,7 +128,7 @@ pygimp_param_to_tuple(int nparams, const GimpParam *params)
|
||||||
args = PyTuple_New(nparams);
|
args = PyTuple_New(nparams);
|
||||||
for (i = 0; i < nparams && params[i].type != GIMP_PDB_END; i++) {
|
for (i = 0; i < nparams && params[i].type != GIMP_PDB_END; i++) {
|
||||||
PyObject *value = NULL;
|
PyObject *value = NULL;
|
||||||
|
|
||||||
#if PG_DEBUG > 1
|
#if PG_DEBUG > 1
|
||||||
g_printf("param_to_tuple: type: %d, PDB_ITEM: %d\n", params[i].type, GIMP_PDB_ITEM);
|
g_printf("param_to_tuple: type: %d, PDB_ITEM: %d\n", params[i].type, GIMP_PDB_ITEM);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
typedef short sa_family_t; /* Not defined by winsock */
|
typedef short sa_family_t; /* Not defined by winsock */
|
||||||
|
|
||||||
#ifndef AI_ADDRCONFIG
|
#ifndef AI_ADDRCONFIG
|
||||||
/* Missing from mingw headers, but value is publicly documented
|
/* Missing from mingw headers, but value is publicly documented
|
||||||
* on http://msdn.microsoft.com/en-us/library/ms737530%28v=VS.85%29.aspx
|
* on http://msdn.microsoft.com/en-us/library/ms737530%28v=VS.85%29.aspx
|
||||||
*/
|
*/
|
||||||
#define AI_ADDRCONFIG 0x0400
|
#define AI_ADDRCONFIG 0x0400
|
||||||
|
|
|
@ -7,7 +7,7 @@ AM_CFLAGS = \
|
||||||
-DUSE_ASCII_NAMES=0 \
|
-DUSE_ASCII_NAMES=0 \
|
||||||
-DUSE_STRLWR=0 \
|
-DUSE_STRLWR=0 \
|
||||||
-I$(top_srcdir) \
|
-I$(top_srcdir) \
|
||||||
$(GLIB_CFLAGS)
|
$(GLIB_CFLAGS)
|
||||||
|
|
||||||
noinst_LIBRARIES = libtinyscheme.a
|
noinst_LIBRARIES = libtinyscheme.a
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue