projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
scan: New library for high-level PSPP syntax lexical analysis.
[pspp-builds.git]
/
src
/
ui
/
gui
/
syntax-editor-source.c
diff --git
a/src/ui/gui/syntax-editor-source.c
b/src/ui/gui/syntax-editor-source.c
index 9e1f2e8770c926b5b2b61f5eefae05524c7985b3..6ec866c93a11d7997f2de2fd66583b040e5b06b3 100644
(file)
--- a/
src/ui/gui/syntax-editor-source.c
+++ b/
src/ui/gui/syntax-editor-source.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2006 Free Software Foundation
+ Copyright (C) 2006
, 2009
Free Software Foundation
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
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
@@
-19,6
+19,7
@@
#include <libpspp/getl.h>
#include <libpspp/compiler.h>
#include <libpspp/getl.h>
#include <libpspp/compiler.h>
+#include <libpspp/cast.h>
#include <libpspp/str.h>
#include <stdlib.h>
#include <libpspp/str.h>
#include <stdlib.h>
@@
-36,6
+37,7
@@
struct syntax_editor_source
GtkTextBuffer *buffer;
GtkTextIter i;
GtkTextIter end;
GtkTextBuffer *buffer;
GtkTextIter i;
GtkTextIter end;
+ const gchar *name;
};
};
@@
-49,10
+51,8
@@
always_false (const struct getl_interface *i UNUSED)
static const char *
name (const struct getl_interface *i)
{
static const char *
name (const struct getl_interface *i)
{
- // const struct syntax_editor_source *ses =
- // (const struct syntax_editor_source *) i;
-
- return "I have no idea"; // window_name ((const struct editor_window *) ses->se);
+ const struct syntax_editor_source *ses = (const struct syntax_editor_source *) i;
+ return ses->name;
}
}
@@
-73,7
+73,8
@@
read_line_from_buffer (struct getl_interface *i,
gchar *text;
GtkTextIter next_line;
gchar *text;
GtkTextIter next_line;
- struct syntax_editor_source *ses = (struct syntax_editor_source *) i;
+ struct syntax_editor_source *ses
+ = UP_CAST (i, struct syntax_editor_source, parent);
if ( gtk_text_iter_compare (&ses->i, &ses->end) >= 0)
return false;
if ( gtk_text_iter_compare (&ses->i, &ses->end) >= 0)
return false;
@@
-105,7
+106,8
@@
do_close (struct getl_interface *i )
struct getl_interface *
create_syntax_editor_source (GtkTextBuffer *buffer,
GtkTextIter start,
struct getl_interface *
create_syntax_editor_source (GtkTextBuffer *buffer,
GtkTextIter start,
- GtkTextIter stop
+ GtkTextIter stop,
+ const gchar *nm
)
{
struct syntax_editor_source *ses = xzalloc (sizeof *ses);
)
{
struct syntax_editor_source *ses = xzalloc (sizeof *ses);
@@
-113,6
+115,7
@@
create_syntax_editor_source (GtkTextBuffer *buffer,
ses->buffer = buffer;
ses->i = start;
ses->end = stop;
ses->buffer = buffer;
ses->i = start;
ses->end = stop;
+ ses->name = nm;
ses->parent.interactive = always_false;
ses->parent.interactive = always_false;
@@
-123,5
+126,5
@@
create_syntax_editor_source (GtkTextBuffer *buffer,
ses->parent.location = location;
ses->parent.location = location;
- return
(struct getl_interface *) ses
;
+ return
&ses->parent
;
}
}