Commits January 2009

commits@lists.geany.org

3 participants
98 discussions

by eht16＠users.sourceforge.net

Revision: 3531 http://geany.svn.sourceforge.net/geany/?rev=3531&view=rev Author: eht16 Date: 2009-01-30 18:53:23 +0000 (Fri, 30 Jan 2009) Log Message: ----------- Add some missing @since tags to the API documentation of various functions. Modified Paths: -------------- trunk/ChangeLog trunk/doc/plugins.dox trunk/src/dialogs.c trunk/src/document.c trunk/src/editor.c trunk/src/editor.h trunk/src/filetypes.c trunk/src/msgwindow.c trunk/src/sciwrappers.c trunk/src/ui_utils.c trunk/src/ui_utils.h trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-30 18:10:27 UTC (rev 3530) +++ trunk/ChangeLog 2009-01-30 18:53:23 UTC (rev 3531) @@ -8,6 +8,11 @@ as tooltips. * HACKING, doc/plugins.dox: Add a few notes about basic plugin writing guidelines. + * doc/plugins.dox, src/dialogs.c, src/document.c, src/editor.c, + src/editor.h, src/filetypes.c, src/msgwindow.c, src/sciwrappers.c, + src/ui_utils.c, src/ui_utils.h, src/utils.c: + Add some missing @since tags to the API documentation of various + functions. 2009-01-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/doc/plugins.dox =================================================================== --- trunk/doc/plugins.dox 2009-01-30 18:10:27 UTC (rev 3530) +++ trunk/doc/plugins.dox 2009-01-30 18:53:23 UTC (rev 3531) @@ -245,6 +245,8 @@ * @param user_data user data. * @return @c TRUE to stop other handlers from being invoked for the event. * @c FALSE to propagate the event further. + * + * @since 0.16 * @endsignaldef * * Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2009-01-30 18:10:27 UTC (rev 3530) +++ trunk/src/dialogs.c 2009-01-30 18:53:23 UTC (rev 3531) @@ -928,6 +928,8 @@ * (see documentation for @a gtk_spin_button_new_with_range()). * * @return @a TRUE if a value was entered and the dialog closed with 'OK'. @a FALSE otherwise. + * + * @since 0.16 **/ gboolean dialogs_show_input_numeric(const gchar *title, const gchar *label_text, gdouble *value, gdouble min, gdouble max, gdouble step) Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-01-30 18:10:27 UTC (rev 3530) +++ trunk/src/document.c 2009-01-30 18:53:23 UTC (rev 3531) @@ -124,6 +124,8 @@ * @return The matching document, or NULL. * @note This is only really useful when passing a @c TMWorkObject::file_name. * @see document_find_by_filename(). + * + * @since 0.15 **/ GeanyDocument* document_find_by_real_path(const gchar *realname) { @@ -596,6 +598,8 @@ * @param doc The document to remove. * * @return @a TRUE if the document was actually removed or @a FALSE otherwise. + * + * @since 0.15 **/ gboolean document_close(GeanyDocument *doc) { @@ -1501,7 +1505,9 @@ * * @param doc The current document which should be renamed. * @param new_filename The new filename in UTF-8 encoding. - */ + * + * @since 0.16 + **/ void document_rename_file(GeanyDocument *doc, const gchar *new_filename) { gchar *old_locale_filename = utils_get_locale_from_utf8(doc->file_name); @@ -1526,7 +1532,9 @@ * @return @c TRUE if the file was saved or @c FALSE if the file could not be saved. * * @see document_save_file(). - */ + * + * @since 0.16 + **/ gboolean document_save_file_as(GeanyDocument *doc, const gchar *utf8_fname) { gboolean ret; @@ -2698,7 +2706,10 @@ /** Accessor function for @ref GeanyData::documents_array items. * @warning Always check the returned document is valid (@c doc->is_valid). * @param idx @c documents_array index. - * @return The document, or @c NULL if @a idx is out of range. */ + * @return The document, or @c NULL if @a idx is out of range. + * + * @since 0.16 + */ GeanyDocument *document_index(gint idx) { return (idx >= 0 && idx < (gint) documents_array->len) ? documents[idx] : NULL; Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-01-30 18:10:27 UTC (rev 3530) +++ trunk/src/editor.c 2009-01-30 18:53:23 UTC (rev 3531) @@ -3692,7 +3692,9 @@ * * @param editor The editor to operate on. * @param indic The indicator number to clear, this is a value of @ref GeanyIndicator. - **/ + * + * @since 0.16 + */ void editor_indicator_clear(GeanyEditor *editor, gint indic) { glong last_pos; @@ -3715,7 +3717,9 @@ * @param editor The editor to operate on. * @param indic The indicator number to use, this is a value of @ref GeanyIndicator. * @param line The line number which should be marked. - **/ + * + * @since 0.16 + */ void editor_indicator_set_on_line(GeanyEditor *editor, gint indic, gint line) { gint start, end; @@ -3758,7 +3762,9 @@ * @param indic The indicator number to use, this is a value of @ref GeanyIndicator. * @param start The starting position for the marker. * @param end The ending position for the marker. - **/ + * + * @since 0.16 + */ void editor_indicator_set_on_range(GeanyEditor *editor, gint indic, gint start, gint end) { if (editor == NULL || start >= end) @@ -4067,7 +4073,10 @@ /** Set the indent type for @a editor. * @param editor Editor. - * @param type Indent type. */ + * @param type Indent type. + * + * @since 0.16 + */ void editor_set_indent_type(GeanyEditor *editor, GeanyIndentType type) { const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); @@ -4255,7 +4264,10 @@ /** Create a new Scintilla @c GtkWidget based on the settings for @a editor. * @param editor Editor settings. - * @return The new widget. */ + * @return The new widget. + * + * @since 0.15 + **/ ScintillaObject *editor_create_widget(GeanyEditor *editor) { const GeanyIndentPrefs *iprefs = get_default_indent_prefs(); Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2009-01-30 18:10:27 UTC (rev 3530) +++ trunk/src/editor.h 2009-01-30 18:53:23 UTC (rev 3531) @@ -74,7 +74,10 @@ GeanyIndicator; /** Indentation prefs that might be different according to project or filetype. - * Use @c editor_get_indent_prefs() to lookup the prefs for a particular document. */ + * Use @c editor_get_indent_prefs() to lookup the prefs for a particular document. + * + * @since 0.15 + **/ typedef struct GeanyIndentPrefs { gint width; /**< Indent width. */ Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2009-01-30 18:10:27 UTC (rev 3530) +++ trunk/src/filetypes.c 2009-01-30 18:53:23 UTC (rev 3531) @@ -1316,7 +1316,10 @@ /** Find a filetype pointer from its @c name field. * @param name Filetype name. - * @return The filetype found, or @c NULL. */ + * @return The filetype found, or @c NULL. + * + * @since 0.15 + **/ GeanyFiletype *filetypes_lookup_by_name(const gchar *name) { GeanyFiletype *ft; @@ -1456,7 +1459,10 @@ /** Accessor function for @ref GeanyData::filetypes_array items. * Example: @code ft = filetypes_index(GEANY_FILETYPES_C); @endcode * @param idx @c filetypes_array index. - * @return The filetype, or @c NULL if @a idx is out of range. */ + * @return The filetype, or @c NULL if @a idx is out of range. + * + * @since 0.16 + */ GeanyFiletype *filetypes_index(gint idx) { return (idx >= 0 && idx < (gint) filetypes_array->len) ? filetypes[idx] : NULL; Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2009-01-30 18:10:27 UTC (rev 3530) +++ trunk/src/msgwindow.c 2009-01-30 18:53:23 UTC (rev 3531) @@ -273,6 +273,8 @@ * @param doc The document. Set to @c NULL to ignore. * @param format @c printf()-style format string. * @param ... Arguments for the @c format string. + * + * @since 0.15 **/ void msgwin_msg_add(gint msg_color, gint line, GeanyDocument *doc, const gchar *format, ...) { @@ -1006,6 +1008,8 @@ * @param tabnum An index of a tab in the messages window. Valid values are all elements of * #MessageWindowTabNum. * @param show Whether to show the messages window at all if it was hidden before. + * + * @since 0.15 **/ void msgwin_switch_tab(gint tabnum, gboolean show) { @@ -1034,6 +1038,8 @@ * * @param tabnum An index of a tab in the messages window which should be cleared. * Valid values are @a MSG_STATUS, @a MSG_COMPILER and @a MSG_MESSAGE. + * + * @since 0.15 **/ void msgwin_clear_tab(gint tabnum) { Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2009-01-30 18:10:27 UTC (rev 3530) +++ trunk/src/sciwrappers.c 2009-01-30 18:53:23 UTC (rev 3531) @@ -684,7 +684,10 @@ /** Get display tab width (this is not indent width, see GeanyIndentPrefs). * @param sci Scintilla widget. - * @return Width. */ + * @return Width. + * + * @since 0.15 + **/ gint sci_get_tab_width(ScintillaObject * sci) { return SSM(sci, SCI_GETTABWIDTH, 0, 0); @@ -720,7 +723,10 @@ /** Check if there's a selection. * @param sci Scintilla widget. - * @return Whether a selection is present. */ + * @return Whether a selection is present. + * + * @since 0.15 + **/ gboolean sci_has_selection(ScintillaObject *sci) { if (SSM(sci, SCI_GETSELECTIONEND,0,0) - SSM(sci, SCI_GETSELECTIONSTART,0,0)) @@ -926,7 +932,10 @@ /** A simple convenience function for sending Scintilla commands without any parameters. * @param sci The Scintilla @c GtkWidget. * @param cmd @c SCI_COMMAND. - * @see http://scintilla.org for the documentation. */ + * @see http://scintilla.org for the documentation. + * + * @since 0.16 + */ void sci_send_command(ScintillaObject * sci, gint cmd) { SSM(sci, cmd, 0, 0); @@ -986,7 +995,9 @@ * @param indic The indicator number to set. * * @see sci_indicator_clear - **/ + * + * @since 0.16 + */ void sci_indicator_set(ScintillaObject *sci, gint indic) { SSM(sci, SCI_SETINDICATORCURRENT, indic, 0); @@ -1006,7 +1017,9 @@ * @param sci Scintilla widget. * @param pos Starting position. * @param len Length. - **/ + * + * @since 0.16 + */ void sci_indicator_clear(ScintillaObject *sci, gint pos, gint len) { SSM(sci, SCI_INDICATORCLEARRANGE, pos, len); @@ -1030,7 +1043,10 @@ /** Find a matching brace at @a pos. * @param sci Scintilla widget. * @param pos Position. - * @return Matching brace position. */ + * @return Matching brace position. + * + * @since 0.15 + **/ gint sci_find_matching_brace(ScintillaObject *sci, gint pos) { return SSM(sci, SCI_BRACEMATCH, pos, 0); Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2009-01-30 18:10:27 UTC (rev 3530) +++ trunk/src/ui_utils.c 2009-01-30 18:53:23 UTC (rev 3531) @@ -690,7 +690,10 @@ /** Add a widget to the list of widgets that should be set sensitive/insensitive * when some documents are present/no documents are open. * It will be removed when the widget is destroyed. - * @param widget The widget to add. */ + * @param widget The widget to add. + * + * @since 0.15 + **/ void ui_add_document_sensitive(GtkWidget *widget) { gboolean enable = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) ? TRUE : FALSE; @@ -1170,7 +1173,10 @@ /** Create a @c GtkImageMenuItem with a stock image and a custom label. * @param stock_id Stock image ID, e.g. @c GTK_STOCK_OPEN. * @param label Menu item label, can include mnemonics. - * @return The new @c GtkImageMenuItem. */ + * @return The new @c GtkImageMenuItem. + * + * @since 0.16 + */ GtkWidget * ui_image_menu_item_new(const gchar *stock_id, const gchar *label) { @@ -1200,6 +1206,8 @@ * nothing happens. If ran with GTK 2.16 or newer, the icon is displayed. * * @param entry The GtkEntry object to which the icon should be attached. + * + * @since 0.16 */ void ui_entry_add_clear_icon(GtkWidget *entry) { @@ -1753,6 +1761,8 @@ * * @param widget The widget the tooltip should be set for. * @param text The text for the tooltip. + * + * @since 0.16 */ void ui_widget_set_tooltip_text(GtkWidget *widget, const gchar *text) { @@ -1776,7 +1786,10 @@ * @param widget Widget with the @a widget_name property set. * @param widget_name Name to lookup. * @return The widget found. - * @see ui_hookup_widget(). */ + * @see ui_hookup_widget(). + * + * @since 0.16 + */ GtkWidget *ui_lookup_widget(GtkWidget *widget, const gchar *widget_name) { GtkWidget *parent, *found_widget; @@ -1841,7 +1854,9 @@ * in @c src/printing.c. * * @param text The text to be shown as the progress bar label or NULL to leave it empty. - */ + * + * @since 0.16 + **/ void ui_progress_bar_start(const gchar *text) { g_return_if_fail(progress_bar_timer_id == (guint) -1); @@ -1857,7 +1872,10 @@ } -/** Stops a running progress bar and hides the widget again. */ +/** Stops a running progress bar and hides the widget again. + * + * @since 0.16 + **/ void ui_progress_bar_stop(void) { gtk_widget_hide(GTK_WIDGET(main_widgets.progressbar)); Modified: trunk/src/ui_utils.h =================================================================== --- trunk/src/ui_utils.h 2009-01-30 18:10:27 UTC (rev 3530) +++ trunk/src/ui_utils.h 2009-01-30 18:53:23 UTC (rev 3531) @@ -28,7 +28,10 @@ * @param owner Usually a @c GtkWindow. * @param widget Widget. * @param widget_name Name. - * @see ui_lookup_widget(). */ + * @see ui_lookup_widget(). + * + * @since 0.16 + **/ #define ui_hookup_widget(owner, widget, widget_name) \ g_object_set_data_full(G_OBJECT(owner), widget_name, \ g_object_ref(widget), (GDestroyNotify)g_object_unref); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2009-01-30 18:10:27 UTC (rev 3530) +++ trunk/src/utils.c 2009-01-30 18:53:23 UTC (rev 3531) @@ -67,6 +67,8 @@ * browsers. * * @param uri The URI to open in the web browser. + * + * @since 0.16 **/ void utils_open_browser(const gchar *uri) { @@ -342,7 +344,9 @@ * * @return an integer less than, equal to, or greater than zero if @a s1 is found, respectively, * to be less than, to match, or to be greater than @a s2. - **/ + * + * @since 0.16 + */ gint utils_str_casecmp(const gchar *s1, const gchar *s2) { gchar *tmp1, *tmp2; @@ -566,7 +570,9 @@ * @param time_to_use The date/time to use, in time_t format or NULL to use the current time. * * @return A newly-allocated string, should be freed when no longer needed. - **/ + * + * @since 0.16 + */ gchar *utils_get_date_time(const gchar *format, time_t *time_to_use) { const struct tm *tm; @@ -1334,7 +1340,8 @@ /** - * Convenience function to replace only the occurrence of @c needle in @c haystack with @c. + * Convenience function to replace only the first occurrence of @c needle in @c haystack + * with @ replace. * For details, see utils_string_replace_all(). * * @param haystack The input string to operate on. This string is modified in place. @@ -1342,6 +1349,8 @@ * @param replace The replacement for @c needle. * * @return @a amount of replacements done + * + * @since 0.16 */ guint utils_string_replace_first(GString *haystack, const gchar *needle, const gchar *replace) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 10 months

SF.net SVN: geany:[3530] trunk

by eht16＠users.sourceforge.net

Revision: 3530 http://geany.svn.sourceforge.net/geany/?rev=3530&view=rev Author: eht16 Date: 2009-01-30 18:10:27 +0000 (Fri, 30 Jan 2009) Log Message: ----------- Add a few notes about basic plugin writing guidelines. Modified Paths: -------------- trunk/ChangeLog trunk/HACKING trunk/doc/plugins.dox Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-30 16:12:25 UTC (rev 3529) +++ trunk/ChangeLog 2009-01-30 18:10:27 UTC (rev 3530) @@ -6,6 +6,8 @@ Allow entering paths prefixed with '~' in the filebrowser path entry. Show the full path for files and folders in the filebrowser plugin as tooltips. + * HACKING, doc/plugins.dox: + Add a few notes about basic plugin writing guidelines. 2009-01-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/HACKING =================================================================== --- trunk/HACKING 2009-01-30 16:12:25 UTC (rev 3529) +++ trunk/HACKING 2009-01-30 18:10:27 UTC (rev 3530) @@ -20,6 +20,8 @@ * See plugins/demoplugin.c for a very basic example plugin. * src/plugins.c loads and unloads plugins (you shouldn't need to read this really). +* The API documentation contains a few basic guidelines and hints to + write plugins. You should generate and read the plugin API documentation, see below. Modified: trunk/doc/plugins.dox =================================================================== --- trunk/doc/plugins.dox 2009-01-30 16:12:25 UTC (rev 3529) +++ trunk/doc/plugins.dox 2009-01-30 18:10:27 UTC (rev 3530) @@ -44,6 +44,7 @@ * - @link plugindata.h Main Datatypes and Macros @endlink * - @link pluginsymbols.c Plugin Symbols @endlink * - @link signals Plugin Signals @endlink + * - @link guidelines Plugin Writing Guidelines @endlink * * @note Some of these pages are also listed in Related Pages. */ @@ -248,6 +249,77 @@ * * * + * @page guidelines Plugin Writing Guidelines + * + * @section intro Introduction + * + * The following hints and guidelines are only recommendations. Nobody is forced to follow + * them at all. + * + * @section general General notes + * + * @subsection ideas Getting a plugin idea + * + * If you want to write a plugin but don't know yet what it should do, have a look at + * http://www.geany.org/Support/PluginWishlist to get an idea about what users wish. + * + * @subsection code Managing the source code + * + * For authors of plugins for Geany, we created a dedicated @a geany-plugins project at + * Sourceforge to ease development of plugins and help new authors. + * Project website: http://sourceforge.net/projects/geany-plugins + * + * Each plugin author is welcome to use these services. To do so, you need an account at + * Sourceforge. You can easily register at (http://sourceforge.net/account/registration/). + * After you successfully created an account, + * tell your account name Enrico or Nick and you will write access to the SVN repository + * (http://geany-plugins.svn.sourceforge.net/viewvc/geany-plugins/). + * Then you can use the repository for your own plugin. + * + * Authors using this service should subscribe to the + * geany-plugins-commits at uvena.de and geany-plugins-tracker at uvena.de + * mailing lists(see my previous post) to stay up to date with changes. + * General plugin discussion can happen on the normal geany at uvena.de or + * geany-devel at uvena.de lists. + * + * At time of writing, there are some plugins already available in the + * repository. Feel free to use any of these plugins as a start for your own, + * maybe by copying the directory structure and the autotools files + * (Makefile.am, configure.in, ...). Most of the available plugins are also ready for + * i18n support, just for reference. + * + * New plugins should be imported into a new directory inside the trunk/ + * directory. There are also the common branches and tags directories, use + * them as needed, use always a subdirectory for your own plugin. + * + * We encourage authors using this service to only commit changes to their + * own plugin and not to others' plugins. Instead just send patches to + * geany-devel at uvena.de or the plugin author directly. + * + * (the full announcement of this service can be found at + * http://lists.uvena.de/geany/2008-April/003225.html) + * + * + * @section paths Installation paths + * + * - The plugin binary (@c pluginname.so) should be installed in Geany's libdir. This is + * necessary so that Geany can find the plugin. + * An easy way to retrieve Geany's libdir is to use the pkg-config tool, e.g. @code + * `$PKG_CONFIG --variable=libdir geany`/ geany + * @endcode + * - If your plugin creates other binary files like helper programs or helper libraries, + * they should go into @c $prefix/bin (for programs, ideally prefixed with @a geany), + * additional libraries should be installed in Geany's libdir, maybe in a subdirectory. + * - Plugins should install their documentation files (README, NEWS, ChangeLog, licences and + * other documentation files) into the common documentation directory + * @c $prefix/share/doc/geany-plugins/$pluginname/ + * - Translation files should be installed normally into @c $prefix/share/locale. There is no + * need to use Geany's translation directory. To set up translation support properly and + * for additional information, see main_locale_init(). + * - Do @a never install anything into a user's home directory like installing + * the plugin binary in @c ~/.config/geany/plugins/. + * + * * @page howto Plugin Howto * * @section intro Introduction This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 10 months

SF.net SVN: geany:[3529] trunk

by eht16＠users.sourceforge.net

Revision: 3529 http://geany.svn.sourceforge.net/geany/?rev=3529&view=rev Author: eht16 Date: 2009-01-30 16:12:25 +0000 (Fri, 30 Jan 2009) Log Message: ----------- Add utils_string_replace_first() to the plugin API. Allow entering paths prefixed with '~' in the filebrowser path entry. Show the full path for files and folders in the filebrowser plugin as tooltips. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/filebrowser.c trunk/plugins/geanyfunctions.h trunk/src/plugindata.h trunk/src/plugins.c trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-30 15:39:08 UTC (rev 3528) +++ trunk/ChangeLog 2009-01-30 16:12:25 UTC (rev 3529) @@ -1,3 +1,13 @@ +2009-01-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/plugins.c, src/plugindata.h, src/utils.c, plugins/filebrowser.c, + plugins/geanyfunctions.h: + Add utils_string_replace_first() to the plugin API. + Allow entering paths prefixed with '~' in the filebrowser path entry. + Show the full path for files and folders in the filebrowser plugin + as tooltips. + + 2009-01-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * autogen.sh: Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2009-01-30 15:39:08 UTC (rev 3528) +++ trunk/plugins/filebrowser.c 2009-01-30 16:12:25 UTC (rev 3529) @@ -45,7 +45,7 @@ GeanyFunctions *geany_functions; -PLUGIN_VERSION_CHECK(69) +PLUGIN_VERSION_CHECK(131) PLUGIN_SET_INFO(_("File Browser"), _("Adds a file browser tab to the sidebar."), VERSION, _("The Geany developer team")) @@ -66,6 +66,7 @@ { FILEVIEW_COLUMN_ICON = 0, FILEVIEW_COLUMN_NAME, + FILEVIEW_COLUMN_FILENAME, /* the full filename, including path for display as tooltip */ FILEVIEW_N_COLUMNS }; @@ -146,7 +147,7 @@ static void add_item(const gchar *name) { GtkTreeIter iter; - gchar *fname, *utf8_name; + gchar *fname, *utf8_name, *utf8_fullname, *sep; gboolean dir; if (! show_hidden_files && check_hidden(name)) @@ -155,8 +156,10 @@ if (check_filtered(name)) return; - fname = g_strconcat(current_dir, G_DIR_SEPARATOR_S, name, NULL); + sep = (utils_str_equal(current_dir, "/")) ? "" : G_DIR_SEPARATOR_S; + fname = g_strconcat(current_dir, sep, name, NULL); dir = g_file_test(fname, G_FILE_TEST_IS_DIR); + utf8_fullname = utils_get_locale_from_utf8(fname); g_free(fname); if (dir) @@ -177,8 +180,11 @@ gtk_list_store_set(file_store, &iter, FILEVIEW_COLUMN_ICON, (dir) ? GTK_STOCK_DIRECTORY : GTK_STOCK_FILE, - FILEVIEW_COLUMN_NAME, utf8_name, -1); + FILEVIEW_COLUMN_NAME, utf8_name, + FILEVIEW_COLUMN_FILENAME, utf8_fullname, + -1); g_free(utf8_name); + g_free(utf8_fullname); } @@ -186,15 +192,23 @@ static void add_top_level_entry(void) { GtkTreeIter iter; + gchar *utf8_dir; if (! NZV(g_path_skip_root(current_dir))) return; /* ignore 'C:\' or '/' */ + utf8_dir = g_path_get_dirname(current_dir); + setptr(utf8_dir, utils_get_utf8_from_locale(utf8_dir)); + gtk_list_store_prepend(file_store, &iter); last_dir_iter = gtk_tree_iter_copy(&iter); gtk_list_store_set(file_store, &iter, - FILEVIEW_COLUMN_ICON, GTK_STOCK_DIRECTORY, FILEVIEW_COLUMN_NAME, "..", -1); + FILEVIEW_COLUMN_ICON, GTK_STOCK_DIRECTORY, + FILEVIEW_COLUMN_NAME, "..", + FILEVIEW_COLUMN_FILENAME, utf8_dir, + -1); + g_free(utf8_dir); } @@ -336,17 +350,9 @@ gchar *name, *fname; gtk_tree_model_get_iter(model, &iter, treepath); - gtk_tree_model_get(model, &iter, FILEVIEW_COLUMN_NAME, &name, -1); + gtk_tree_model_get(model, &iter, FILEVIEW_COLUMN_FILENAME, &name, -1); - if (utils_str_equal(name, "..")) - { - fname = g_path_get_dirname(current_dir); - } - else - { - setptr(name, utils_get_locale_from_utf8(name)); - fname = g_build_filename(current_dir, name, NULL); - } + fname = utils_get_locale_from_utf8(name); g_free(name); return fname; @@ -637,7 +643,14 @@ on_go_up(); return; } - new_dir = utils_get_locale_from_utf8(new_dir); + else if (new_dir[0] == '~') + { + GString *str = g_string_new(new_dir); + utils_string_replace_first(str, "~", g_get_home_dir()); + new_dir = g_string_free(str, FALSE); + } + else + new_dir = utils_get_locale_from_utf8(new_dir); } else new_dir = g_strdup(g_get_home_dir()); @@ -668,7 +681,7 @@ GtkTreeSelection *select; PangoFontDescription *pfd; - file_store = gtk_list_store_new(FILEVIEW_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING); + file_store = gtk_list_store_new(FILEVIEW_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); gtk_tree_view_set_model(GTK_TREE_VIEW(file_view), GTK_TREE_MODEL(file_store)); g_object_unref(file_store); @@ -690,6 +703,10 @@ gtk_widget_modify_font(file_view, pfd); pango_font_description_free(pfd); + /* GTK 2.12 tooltips */ + if (gtk_check_version(2, 12, 0) == NULL) + g_object_set(file_view, "has-tooltip", TRUE, "tooltip-column", FILEVIEW_COLUMN_FILENAME, NULL); + /* selection handling */ select = gtk_tree_view_get_selection(GTK_TREE_VIEW(file_view)); gtk_tree_selection_set_mode(select, GTK_SELECTION_MULTIPLE); Modified: trunk/plugins/geanyfunctions.h =================================================================== --- trunk/plugins/geanyfunctions.h 2009-01-30 15:39:08 UTC (rev 3528) +++ trunk/plugins/geanyfunctions.h 2009-01-30 16:12:25 UTC (rev 3529) @@ -166,6 +166,8 @@ geany_functions->p_utils->get_date_time #define utils_open_browser \ geany_functions->p_utils->open_browser +#define utils_string_replace_first \ + geany_functions->p_utils->string_replace_first #define ui_dialog_vbox_new \ geany_functions->p_ui->dialog_vbox_new #define ui_frame_new_with_alignment \ Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2009-01-30 15:39:08 UTC (rev 3528) +++ trunk/src/plugindata.h 2009-01-30 16:12:25 UTC (rev 3529) @@ -45,7 +45,7 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 130, + GEANY_API_VERSION = 131, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ @@ -354,6 +354,8 @@ gint (*str_casecmp) (const gchar *s1, const gchar *s2); gchar* (*get_date_time) (const gchar *format, time_t *time_to_use); void (*open_browser) (const gchar *uri); + guint (*string_replace_first) (GString *haystack, const gchar *needle, + const gchar *replace); } UtilsFuncs; Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2009-01-30 15:39:08 UTC (rev 3528) +++ trunk/src/plugins.c 2009-01-30 16:12:25 UTC (rev 3529) @@ -214,7 +214,8 @@ &utils_spawn_async, &utils_str_casecmp, &utils_get_date_time, - &utils_open_browser + &utils_open_browser, + &utils_string_replace_first }; static UIUtilsFuncs uiutils_funcs = { Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2009-01-30 15:39:08 UTC (rev 3528) +++ trunk/src/utils.c 2009-01-30 16:12:25 UTC (rev 3529) @@ -1333,10 +1333,9 @@ } -/* - * Replaces the first occurrence of @c needle in @c haystack with @c replace. - * As of Geany 0.16, @a replace can match @a needle, so the following will work: - * @code utils_string_replace_all(text, "\n", "\r\n"); @endcode +/** + * Convenience function to replace only the occurrence of @c needle in @c haystack with @c. + * For details, see utils_string_replace_all(). * * @param haystack The input string to operate on. This string is modified in place. * @param needle The string which should be replaced. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 10 months

SF.net SVN: geany:[3528] trunk/src

by eht16＠users.sourceforge.net

Revision: 3528 http://geany.svn.sourceforge.net/geany/?rev=3528&view=rev Author: eht16 Date: 2009-01-30 15:39:08 +0000 (Fri, 30 Jan 2009) Log Message: ----------- If the VTE has a dirty command line, print the resulting warning also to the debug messages. Modified Paths: -------------- trunk/src/build.c trunk/src/vte.c Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-01-29 17:24:31 UTC (rev 3527) +++ trunk/src/build.c 2009-01-30 15:39:08 UTC (rev 3528) @@ -676,8 +676,11 @@ g_free(utf8_working_dir); } if (! vte_send_cmd(vte_cmd)) + { ui_set_statusbar(FALSE, _("Could not execute the file in the VTE because it probably contains a command.")); + geany_debug("Could not execute the file in the VTE because it probably contains a command."); + } /* show the VTE */ gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_VTE); Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2009-01-29 17:24:31 UTC (rev 3527) +++ trunk/src/vte.c 2009-01-30 15:39:08 UTC (rev 3528) @@ -653,8 +653,12 @@ gchar *quoted_path = g_shell_quote(path); gchar *cmd = g_strconcat("cd ", quoted_path, "\n", NULL); if (! vte_send_cmd(cmd)) + { ui_set_statusbar(FALSE, _("Could not change the directory in the VTE because it probably contains a command.")); + geany_debug( + "Could not change the directory in the VTE because it probably contains a command."); + } g_free(quoted_path); g_free(cmd); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 10 months

SF.net SVN: geany:[3527] trunk

by eht16＠users.sourceforge.net

Revision: 3527 http://geany.svn.sourceforge.net/geany/?rev=3527&view=rev Author: eht16 Date: 2009-01-29 17:24:31 +0000 (Thu, 29 Jan 2009) Log Message: ----------- Update Fortran parser from CTags SVN (closes #2545000). Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/fortran.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-29 16:29:59 UTC (rev 3526) +++ trunk/ChangeLog 2009-01-29 17:24:31 UTC (rev 3527) @@ -2,6 +2,8 @@ * autogen.sh: Add a check for 'libtoolize' (suggested by Greg Smith, thanks). + * tagmanager/fortran.c: + Update Fortran parser from CTags SVN (closes #2545000). 2009-01-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/tagmanager/fortran.c =================================================================== --- trunk/tagmanager/fortran.c 2009-01-29 16:29:59 UTC (rev 3526) +++ trunk/tagmanager/fortran.c 2009-01-29 17:24:31 UTC (rev 3527) @@ -1,6 +1,7 @@ /* +* $Id$ * -* Copyright (c) 1998-2001, Darren Hiebert +* Copyright (c) 1998-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the * GNU General Public License. @@ -30,132 +31,159 @@ /* * MACROS */ -#define isident(c) (isalnum(c) || (c) == '_') -#define isBlank(c) (boolean) (c == ' ' || c == '\t') -#define isType(token,t) (boolean) ((token)->type == (t)) -#define isKeyword(token,k) (boolean) ((token)->keyword == (k)) +#define isident(c) (isalnum(c) || (c) == '_') +#define isBlank(c) (boolean) (c == ' ' || c == '\t') +#define isType(token,t) (boolean) ((token)->type == (t)) +#define isKeyword(token,k) (boolean) ((token)->keyword == (k)) +#define isSecondaryKeyword(token,k) (boolean) ((token)->secondary == NULL ? \ + FALSE : (token)->secondary->keyword == (k)) /* * DATA DECLARATIONS */ typedef enum eException { - ExceptionNone, ExceptionEOF, ExceptionFixedFormat + ExceptionNone, ExceptionEOF, ExceptionFixedFormat, ExceptionLoop } exception_t; /* Used to designate type of line read in fixed source form. */ typedef enum eFortranLineType { - LTYPE_UNDETERMINED, - LTYPE_INVALID, - LTYPE_COMMENT, - LTYPE_CONTINUATION, - LTYPE_EOF, - LTYPE_INITIAL, - LTYPE_SHORT + LTYPE_UNDETERMINED, + LTYPE_INVALID, + LTYPE_COMMENT, + LTYPE_CONTINUATION, + LTYPE_EOF, + LTYPE_INITIAL, + LTYPE_SHORT } lineType; /* Used to specify type of keyword. */ typedef enum eKeywordId { - KEYWORD_NONE = -1, - KEYWORD_allocatable, - KEYWORD_assignment, - KEYWORD_block, - KEYWORD_character, - KEYWORD_common, - KEYWORD_complex, - KEYWORD_contains, - KEYWORD_data, - KEYWORD_dimension, - KEYWORD_do, - KEYWORD_double, - KEYWORD_end, - KEYWORD_entry, - KEYWORD_equivalence, - KEYWORD_external, - KEYWORD_format, - KEYWORD_function, - KEYWORD_if, - KEYWORD_implicit, - KEYWORD_include, - KEYWORD_integer, - KEYWORD_intent, - KEYWORD_interface, - KEYWORD_intrinsic, - KEYWORD_logical, - KEYWORD_module, - KEYWORD_namelist, - KEYWORD_operator, - KEYWORD_optional, - KEYWORD_parameter, - KEYWORD_pointer, - KEYWORD_precision, - KEYWORD_private, - KEYWORD_program, - KEYWORD_public, - KEYWORD_real, - KEYWORD_recursive, - KEYWORD_save, - KEYWORD_select, - KEYWORD_sequence, - KEYWORD_subroutine, - KEYWORD_target, - KEYWORD_type, - KEYWORD_use, - KEYWORD_where + KEYWORD_NONE = -1, + KEYWORD_allocatable, + KEYWORD_assignment, + KEYWORD_automatic, + KEYWORD_block, + KEYWORD_byte, + KEYWORD_cexternal, + KEYWORD_cglobal, + KEYWORD_character, + KEYWORD_common, + KEYWORD_complex, + KEYWORD_contains, + KEYWORD_data, + KEYWORD_dimension, + KEYWORD_dllexport, + KEYWORD_dllimport, + KEYWORD_do, + KEYWORD_double, + KEYWORD_elemental, + KEYWORD_end, + KEYWORD_entry, + KEYWORD_equivalence, + KEYWORD_external, + KEYWORD_format, + KEYWORD_function, + KEYWORD_if, + KEYWORD_implicit, + KEYWORD_include, + KEYWORD_inline, + KEYWORD_integer, + KEYWORD_intent, + KEYWORD_interface, + KEYWORD_intrinsic, + KEYWORD_logical, + KEYWORD_map, + KEYWORD_module, + KEYWORD_namelist, + KEYWORD_operator, + KEYWORD_optional, + KEYWORD_parameter, + KEYWORD_pascal, + KEYWORD_pexternal, + KEYWORD_pglobal, + KEYWORD_pointer, + KEYWORD_precision, + KEYWORD_private, + KEYWORD_program, + KEYWORD_public, + KEYWORD_pure, + KEYWORD_real, + KEYWORD_record, + KEYWORD_recursive, + KEYWORD_save, + KEYWORD_select, + KEYWORD_sequence, + KEYWORD_static, + KEYWORD_stdcall, + KEYWORD_structure, + KEYWORD_subroutine, + KEYWORD_target, + KEYWORD_then, + KEYWORD_type, + KEYWORD_union, + KEYWORD_use, + KEYWORD_value, + KEYWORD_virtual, + KEYWORD_volatile, + KEYWORD_where, + KEYWORD_while } keywordId; /* Used to determine whether keyword is valid for the token language and * what its ID is. */ typedef struct sKeywordDesc { - const char *name; - keywordId id; + const char *name; + keywordId id; } keywordDesc; typedef enum eTokenType { - TOKEN_UNDEFINED, - TOKEN_COMMA, - TOKEN_DOUBLE_COLON, - TOKEN_IDENTIFIER, - TOKEN_KEYWORD, - TOKEN_LABEL, - TOKEN_NUMERIC, - TOKEN_OPERATOR, - TOKEN_PAREN_CLOSE, - TOKEN_PAREN_OPEN, - TOKEN_STATEMENT_END, - TOKEN_STRING + TOKEN_UNDEFINED, + TOKEN_COMMA, + TOKEN_DOUBLE_COLON, + TOKEN_IDENTIFIER, + TOKEN_KEYWORD, + TOKEN_LABEL, + TOKEN_NUMERIC, + TOKEN_OPERATOR, + TOKEN_PAREN_CLOSE, + TOKEN_PAREN_OPEN, + TOKEN_PERCENT, + TOKEN_STATEMENT_END, + TOKEN_STRING } tokenType; typedef enum eTagType { - TAG_UNDEFINED = -1, - TAG_BLOCK_DATA, - TAG_COMMON_BLOCK, - TAG_ENTRY_POINT, - TAG_FUNCTION, - TAG_INTERFACE, - TAG_COMPONENT, - TAG_LABEL, - TAG_LOCAL, - TAG_MODULE, - TAG_NAMELIST, - TAG_PROGRAM, - TAG_SUBROUTINE, - TAG_DERIVED_TYPE, - TAG_VARIABLE, - TAG_COUNT /* must be last */ + TAG_UNDEFINED = -1, + TAG_BLOCK_DATA, + TAG_COMMON_BLOCK, + TAG_ENTRY_POINT, + TAG_FUNCTION, + TAG_INTERFACE, + TAG_COMPONENT, + TAG_LABEL, + TAG_LOCAL, + TAG_MODULE, + TAG_NAMELIST, + TAG_PROGRAM, + TAG_SUBROUTINE, + TAG_DERIVED_TYPE, + TAG_VARIABLE, + TAG_COUNT /* must be last */ } tagType; typedef struct sTokenInfo { - tokenType type; - keywordId keyword; - tagType tag; - vString* string; - unsigned long lineNumber; - fpos_t filePosition; - int bufferPosition; /* buffer position of line containing name */ + tokenType type; + keywordId keyword; + tagType tag; + vString* string; + struct sTokenInfo *secondary; + unsigned long lineNumber; + fpos_t filePosition; + int bufferPosition; /* buffer position of line containing name */ } tokenInfo; /* @@ -168,84 +196,118 @@ static int Ungetc = '\0'; static unsigned int Column = 0; static boolean FreeSourceForm = FALSE; +static boolean ParsingString; static tokenInfo *Parent = NULL; /* indexed by tagType */ static kindOption FortranKinds [] = { - { TRUE, 'b', "block data", "block data"}, - { TRUE, 'c', "macro", "common blocks"}, - { TRUE, 'e', "entry", "entry points"}, - { TRUE, 'f', "function", "functions"}, - { TRUE, 'i', "struct", "interfaces"}, - { TRUE, 'k', "component", "type components"}, - { TRUE, 'l', "label", "labels"}, - { FALSE, 'L', "local", "local and common block variables"}, - { TRUE, 'm', "namespace", "modules"}, - { TRUE, 'n', "namelist", "namelists"}, - { TRUE, 'p', "package", "programs"}, - { TRUE, 's', "member", "subroutines"}, - { TRUE, 't', "typedef", "derived types"}, - { TRUE, 'v', "variable", "module variables"} + { TRUE, 'b', "block data", "block data"}, + { TRUE, 'c', "macro", "common blocks"}, + { TRUE, 'e', "entry", "entry points"}, + { TRUE, 'f', "function", "functions"}, + { FALSE, 'i', "struct", "interface contents, generic names, and operators"}, + { TRUE, 'k', "component", "type and structure components"}, + { TRUE, 'l', "label", "labels"}, + { FALSE, 'L', "local", "local, common block, and namelist variables"}, + { TRUE, 'm', "namespace", "modules"}, + { TRUE, 'n', "namelist", "namelists"}, + { TRUE, 'p', "package", "programs"}, + { TRUE, 's', "member", "subroutines"}, + { TRUE, 't', "typedef", "derived types and structures"}, + { TRUE, 'v', "variable", "program (global) and module variables"} }; +/* For efinitions of Fortran 77 with extensions: + * http://www.fortran.com/fortran/F77_std/rjcnf0001.html + * http://scienide.uwaterloo.ca/MIPSpro7/007-2362-004/sgi_html/index.html + * + * For the Compaq Fortran Reference Manual: + * http://h18009.www1.hp.com/fortran/docs/lrm/dflrm.htm + */ + static const keywordDesc FortranKeywordTable [] = { - /* keyword keyword ID */ - { "allocatable", KEYWORD_allocatable }, - { "assignment", KEYWORD_assignment }, - { "block", KEYWORD_block }, - { "character", KEYWORD_character }, - { "common", KEYWORD_common }, - { "complex", KEYWORD_complex }, - { "contains", KEYWORD_contains }, - { "data", KEYWORD_data }, - { "dimension", KEYWORD_dimension }, - { "do", KEYWORD_do }, - { "double", KEYWORD_double }, - { "end", KEYWORD_end }, - { "entry", KEYWORD_entry }, - { "equivalence", KEYWORD_equivalence }, - { "external", KEYWORD_external }, - { "format", KEYWORD_format }, - { "function", KEYWORD_function }, - { "if", KEYWORD_if }, - { "implicit", KEYWORD_implicit }, - { "include", KEYWORD_include }, - { "instrinsic", KEYWORD_intrinsic }, - { "integer", KEYWORD_integer }, - { "intent", KEYWORD_intent }, - { "interface", KEYWORD_interface }, - { "logical", KEYWORD_logical }, - { "module", KEYWORD_module }, - { "namelist", KEYWORD_namelist }, - { "operator", KEYWORD_operator }, - { "optional", KEYWORD_optional }, - { "parameter", KEYWORD_parameter }, - { "pointer", KEYWORD_pointer }, - { "precision", KEYWORD_precision }, - { "private", KEYWORD_private }, - { "program", KEYWORD_program }, - { "public", KEYWORD_public }, - { "real", KEYWORD_real }, - { "recursive", KEYWORD_recursive }, - { "save", KEYWORD_save }, - { "select", KEYWORD_select }, - { "sequence", KEYWORD_sequence }, - { "subroutine", KEYWORD_subroutine }, - { "target", KEYWORD_target }, - { "type", KEYWORD_type }, - { "use", KEYWORD_use }, - { "where", KEYWORD_where } + /* keyword keyword ID */ + { "allocatable", KEYWORD_allocatable }, + { "assignment", KEYWORD_assignment }, + { "automatic", KEYWORD_automatic }, + { "block", KEYWORD_block }, + { "byte", KEYWORD_byte }, + { "cexternal", KEYWORD_cexternal }, + { "cglobal", KEYWORD_cglobal }, + { "character", KEYWORD_character }, + { "common", KEYWORD_common }, + { "complex", KEYWORD_complex }, + { "contains", KEYWORD_contains }, + { "data", KEYWORD_data }, + { "dimension", KEYWORD_dimension }, + { "dll_export", KEYWORD_dllexport }, + { "dll_import", KEYWORD_dllimport }, + { "do", KEYWORD_do }, + { "double", KEYWORD_double }, + { "elemental", KEYWORD_elemental }, + { "end", KEYWORD_end }, + { "entry", KEYWORD_entry }, + { "equivalence", KEYWORD_equivalence }, + { "external", KEYWORD_external }, + { "format", KEYWORD_format }, + { "function", KEYWORD_function }, + { "if", KEYWORD_if }, + { "implicit", KEYWORD_implicit }, + { "include", KEYWORD_include }, + { "inline", KEYWORD_inline }, + { "integer", KEYWORD_integer }, + { "intent", KEYWORD_intent }, + { "interface", KEYWORD_interface }, + { "intrinsic", KEYWORD_intrinsic }, + { "logical", KEYWORD_logical }, + { "map", KEYWORD_map }, + { "module", KEYWORD_module }, + { "namelist", KEYWORD_namelist }, + { "operator", KEYWORD_operator }, + { "optional", KEYWORD_optional }, + { "parameter", KEYWORD_parameter }, + { "pascal", KEYWORD_pascal }, + { "pexternal", KEYWORD_pexternal }, + { "pglobal", KEYWORD_pglobal }, + { "pointer", KEYWORD_pointer }, + { "precision", KEYWORD_precision }, + { "private", KEYWORD_private }, + { "program", KEYWORD_program }, + { "public", KEYWORD_public }, + { "pure", KEYWORD_pure }, + { "real", KEYWORD_real }, + { "record", KEYWORD_record }, + { "recursive", KEYWORD_recursive }, + { "save", KEYWORD_save }, + { "select", KEYWORD_select }, + { "sequence", KEYWORD_sequence }, + { "static", KEYWORD_static }, + { "stdcall", KEYWORD_stdcall }, + { "structure", KEYWORD_structure }, + { "subroutine", KEYWORD_subroutine }, + { "target", KEYWORD_target }, + { "then", KEYWORD_then }, + { "type", KEYWORD_type }, + { "union", KEYWORD_union }, + { "use", KEYWORD_use }, + { "value", KEYWORD_value }, + { "virtual", KEYWORD_virtual }, + { "volatile", KEYWORD_volatile }, + { "where", KEYWORD_where }, + { "while", KEYWORD_while } }; static struct { - unsigned int count; - unsigned int max; - tokenInfo* list; + unsigned int count; + unsigned int max; + tokenInfo* list; } Ancestors = { 0, 0, NULL }; /* * FUNCTION PROTOTYPES */ +static void parseStructureStmt (tokenInfo *const token); +static void parseUnionStmt (tokenInfo *const token); static void parseDerivedTypeDef (tokenInfo *const token); static void parseFunctionSubprogram (tokenInfo *const token); static void parseSubroutineSubprogram (tokenInfo *const token); @@ -256,118 +318,187 @@ static void ancestorPush (tokenInfo *const token) { - enum { incrementalIncrease = 10 }; - if (Ancestors.list == NULL) - { - Assert (Ancestors.max == 0); - Ancestors.count = 0; - Ancestors.max = incrementalIncrease; - Ancestors.list = xMalloc (Ancestors.max, tokenInfo); - } - else if (Ancestors.count == Ancestors.max) - { - Ancestors.max += incrementalIncrease; - Ancestors.list = xRealloc (Ancestors.list, Ancestors.max, tokenInfo); - } - Ancestors.list [Ancestors.count] = *token; - Ancestors.list [Ancestors.count].string = vStringNewCopy (token->string); - Ancestors.count++; + enum { incrementalIncrease = 10 }; + if (Ancestors.list == NULL) + { + Assert (Ancestors.max == 0); + Ancestors.count = 0; + Ancestors.max = incrementalIncrease; + Ancestors.list = xMalloc (Ancestors.max, tokenInfo); + } + else if (Ancestors.count == Ancestors.max) + { + Ancestors.max += incrementalIncrease; + Ancestors.list = xRealloc (Ancestors.list, Ancestors.max, tokenInfo); + } + Ancestors.list [Ancestors.count] = *token; + Ancestors.list [Ancestors.count].string = vStringNewCopy (token->string); + Ancestors.count++; } static void ancestorPop (void) { - Assert (Ancestors.count > 0); - --Ancestors.count; - vStringDelete (Ancestors.list [Ancestors.count].string); + Assert (Ancestors.count > 0); + --Ancestors.count; + vStringDelete (Ancestors.list [Ancestors.count].string); - Ancestors.list [Ancestors.count].type = TOKEN_UNDEFINED; - Ancestors.list [Ancestors.count].keyword = KEYWORD_NONE; - Ancestors.list [Ancestors.count].tag = TAG_UNDEFINED; - Ancestors.list [Ancestors.count].string = NULL; - Ancestors.list [Ancestors.count].lineNumber = 0L; + Ancestors.list [Ancestors.count].type = TOKEN_UNDEFINED; + Ancestors.list [Ancestors.count].keyword = KEYWORD_NONE; + Ancestors.list [Ancestors.count].secondary = NULL; + Ancestors.list [Ancestors.count].tag = TAG_UNDEFINED; + Ancestors.list [Ancestors.count].string = NULL; + Ancestors.list [Ancestors.count].lineNumber = 0L; } +static const tokenInfo* ancestorScope (void) +{ + tokenInfo *result = NULL; + unsigned int i; + for (i = Ancestors.count ; i > 0 && result == NULL ; --i) + { + tokenInfo *const token = Ancestors.list + i - 1; + if (token->type == TOKEN_IDENTIFIER && + token->tag != TAG_UNDEFINED && token->tag != TAG_INTERFACE) + result = token; + } + return result; +} + static const tokenInfo* ancestorTop (void) { - Assert (Ancestors.count > 0); - return &Ancestors.list [Ancestors.count - 1]; + Assert (Ancestors.count > 0); + return &Ancestors.list [Ancestors.count - 1]; } #define ancestorCount() (Ancestors.count) static void ancestorClear (void) { - while (Ancestors.count > 0) - ancestorPop (); - if (Ancestors.list != NULL) - eFree (Ancestors.list); - Ancestors.list = NULL; - Ancestors.count = 0; - Ancestors.max = 0; + while (Ancestors.count > 0) + ancestorPop (); + if (Ancestors.list != NULL) + eFree (Ancestors.list); + Ancestors.list = NULL; + Ancestors.count = 0; + Ancestors.max = 0; } +static boolean insideInterface (void) +{ + boolean result = FALSE; + unsigned int i; + for (i = 0 ; i < Ancestors.count && !result ; ++i) + { + if (Ancestors.list [i].tag == TAG_INTERFACE) + result = TRUE; + } + return result; +} + static void buildFortranKeywordHash (const langType language) { - const size_t count = sizeof (FortranKeywordTable) / - sizeof (FortranKeywordTable [0]); - size_t i; - for (i = 0 ; i < count ; ++i) - { - const keywordDesc* const p = &FortranKeywordTable [i]; - addKeyword (p->name, language, (int) p->id); - } + const size_t count = + sizeof (FortranKeywordTable) / sizeof (FortranKeywordTable [0]); + size_t i; + for (i = 0 ; i < count ; ++i) + { + const keywordDesc* const p = &FortranKeywordTable [i]; + addKeyword (p->name, language, (int) p->id); + } } /* * Tag generation functions */ +static tokenInfo *newToken (void) +{ + tokenInfo *const token = xMalloc (1, tokenInfo); + + token->type = TOKEN_UNDEFINED; + token->keyword = KEYWORD_NONE; + token->tag = TAG_UNDEFINED; + token->string = vStringNew (); + token->secondary = NULL; + token->lineNumber = getSourceLineNumber (); + if (useFile()) + token->filePosition = getInputFilePosition (); + else + token->bufferPosition = getInputBufferPosition (); + + return token; +} + +static tokenInfo *newTokenFrom (tokenInfo *const token) +{ + tokenInfo *result = newToken (); + *result = *token; + result->string = vStringNewCopy (token->string); + token->secondary = NULL; + return result; +} + +static void deleteToken (tokenInfo *const token) +{ + if (token != NULL) + { + vStringDelete (token->string); + deleteToken (token->secondary); + token->secondary = NULL; + eFree (token); + } +} + static boolean isFileScope (const tagType type) { - return (boolean) (type == TAG_LABEL || type == TAG_LOCAL); + return (boolean) (type == TAG_LABEL || type == TAG_LOCAL); } static boolean includeTag (const tagType type) { - boolean include; - Assert (type != TAG_UNDEFINED); - include = FortranKinds [(int) type].enabled; - if (include && isFileScope (type)) - include = Option.include.fileScope; - return include; + boolean include; + Assert (type != TAG_UNDEFINED); + include = FortranKinds [(int) type].enabled; + if (include && isFileScope (type)) + include = Option.include.fileScope; + return include; } static void makeFortranTag (tokenInfo *const token, tagType tag) { - token->tag = tag; - if (includeTag (token->tag)) - { - const char *const name = vStringValue (token->string); - tagEntryInfo e; + token->tag = tag; + if (includeTag (token->tag)) + { + const char *const name = vStringValue (token->string); + tagEntryInfo e; - initTagEntry (&e, name); + initTagEntry (&e, name); - if (token->tag == TAG_COMMON_BLOCK) - e.lineNumberEntry = (boolean) (Option.locate != EX_PATTERN); + if (token->tag == TAG_COMMON_BLOCK) + e.lineNumberEntry = (boolean) (Option.locate != EX_PATTERN); - e.lineNumber = token->lineNumber; - if (useFile()) - e.filePosition = token->filePosition; - else - e.bufferPosition = token->bufferPosition; - e.isFileScope = isFileScope (token->tag); - e.kindName = FortranKinds [token->tag].name; - e.kind = FortranKinds [token->tag].letter; - e.truncateLine = (boolean) (token->tag != TAG_LABEL); + e.lineNumber = token->lineNumber; + if (useFile()) + e.filePosition = token->filePosition; + else + e.bufferPosition = token->bufferPosition; + e.isFileScope = isFileScope (token->tag); + e.kindName = FortranKinds [token->tag].name; + e.kind = FortranKinds [token->tag].letter; + e.truncateLine = (boolean) (token->tag != TAG_LABEL); - if (ancestorCount () > 0) - { - const tokenInfo* const parent = ancestorTop (); - e.extensionFields.scope [0] = FortranKinds [parent->tag].name; - e.extensionFields.scope [1] = vStringValue (parent->string); + if (ancestorCount () > 0) + { + const tokenInfo* const scope = ancestorScope (); + if (scope != NULL) + { + e.extensionFields.scope [0] = FortranKinds [scope->tag].name; + e.extensionFields.scope [1] = vStringValue (scope->string); + } + } + if (! insideInterface () || includeTag (TAG_INTERFACE)) + makeTagEntry (&e); } - makeTagEntry (&e); - } } /* @@ -376,252 +507,265 @@ static int skipLine (void) { - int c; + int c; - do - c = fileGetc (); - while (c != EOF && c != '\n'); + do + c = fileGetc (); + while (c != EOF && c != '\n'); - return c; + return c; } static void makeLabelTag (vString *const label) { - tokenInfo token; - - token.type = TOKEN_LABEL; - token.keyword = KEYWORD_NONE; - token.tag = TAG_LABEL; - token.string = label; - token.lineNumber = getSourceLineNumber (); - if (useFile()) - token.filePosition = getInputFilePosition (); - else - token.bufferPosition = getInputBufferPosition (); - - makeFortranTag (&token, TAG_LABEL); + tokenInfo *token = newToken (); + token->type = TOKEN_LABEL; + vStringCopy (token->string, label); + makeFortranTag (token, TAG_LABEL); + deleteToken (token); } static lineType getLineType (void) { - static vString *label = NULL; - int column = 0; - lineType type = LTYPE_UNDETERMINED; + vString *label = vStringNew (); + int column = 0; + lineType type = LTYPE_UNDETERMINED; - if (label == NULL) - label = vStringNew (); + do /* read in first 6 "margin" characters */ + { + int c = fileGetc (); - do /* read in first 6 "margin" characters */ - { - int c = fileGetc (); + /* 3.2.1 Comment_Line. A comment line is any line that contains + * a C or an asterisk in column 1, or contains only blank characters + * in columns 1 through 72. A comment line that contains a C or + * an asterisk in column 1 may contain any character capable of + * representation in the processor in columns 2 through 72. + */ + /* EXCEPTION! Some compilers permit '!' as a commment character here. + * + * Treat # and $ in column 1 as comment to permit preprocessor directives. + * Treat D and d in column 1 as comment for HP debug statements. + */ + if (column == 0 && strchr ("*Cc!#$Dd", c) != NULL) + type = LTYPE_COMMENT; + else if (c == '\t') /* EXCEPTION! Some compilers permit a tab here */ + { + column = 8; + type = LTYPE_INITIAL; + } + else if (column == 5) + { + /* 3.2.2 Initial_Line. An initial line is any line that is not + * a comment line and contains the character blank or the digit 0 + * in column 6. Columns 1 through 5 may contain a statement label + * (3.4), or each of the columns 1 through 5 must contain the + * character blank. + */ + if (c == ' ' || c == '0') + type = LTYPE_INITIAL; - /* 3.2.1 Comment_Line. A comment line is any line that contains - * a C or an asterisk in column 1, or contains only blank characters - * in columns 1 through 72. A comment line that contains a C or - * an asterisk in column 1 may contain any character capable of - * representation in the processor in columns 2 through 72. - */ - /* EXCEPTION! Some compilers permit '!' as a commment character here. - * - * Treat '#' in column 1 as comment to permit preprocessor directives. - */ - if (column == 0 && strchr ("*Cc!#", c) != NULL) - type = LTYPE_COMMENT; - else if (c == '\t') /* EXCEPTION! Some compilers permit a tab here */ - { - column = 8; - type = LTYPE_INITIAL; - } - else if (column == 5) - { - /* 3.2.2 Initial_Line. An initial line is any line that is not - * a comment line and contains the character blank or the digit 0 - * in column 6. Columns 1 through 5 may contain a statement label - * (3.4), or each of the columns 1 through 5 must contain the - * character blank. - */ - if (c == ' ' || c == '0') - type = LTYPE_INITIAL; + /* 3.2.3 Continuation_Line. A continuation line is any line that + * contains any character of the FORTRAN character set other than + * the character blank or the digit 0 in column 6 and contains + * only blank characters in columns 1 through 5. + */ + else if (vStringLength (label) == 0) + type = LTYPE_CONTINUATION; + else + type = LTYPE_INVALID; + } + else if (c == ' ') + ; + else if (c == EOF) + type = LTYPE_EOF; + else if (c == '\n') + type = LTYPE_SHORT; + else if (isdigit (c)) + vStringPut (label, c); + else + type = LTYPE_INVALID; - /* 3.2.3 Continuation_Line. A continuation line is any line that - * contains any character of the FORTRAN character set other than - * the character blank or the digit 0 in column 6 and contains - * only blank characters in columns 1 through 5. - */ - else if (vStringLength (label) == 0) - type = LTYPE_CONTINUATION; - else - type = LTYPE_INVALID; - } - else if (c == ' ') - ; - else if (c == EOF) - type = LTYPE_EOF; - else if (c == '\n') - type = LTYPE_SHORT; - else if (isdigit (c)) - vStringPut (label, c); - else - type = LTYPE_INVALID; + ++column; + } while (column < 6 && type == LTYPE_UNDETERMINED); - ++column; - } while (column < 6 && type == LTYPE_UNDETERMINED); + Assert (type != LTYPE_UNDETERMINED); - Assert (type != LTYPE_UNDETERMINED); - - if (vStringLength (label) > 0) - { - vStringTerminate (label); - makeLabelTag (label); - vStringClear (label); - } - return type; + if (vStringLength (label) > 0) + { + vStringTerminate (label); + makeLabelTag (label); + } + vStringDelete (label); + return type; } static int getFixedFormChar (void) { - boolean newline = FALSE; - lineType type; - int c = '\0'; + boolean newline = FALSE; + lineType type; + int c = '\0'; - if (Column > 0) - { + if (Column > 0) + { #ifdef STRICT_FIXED_FORM - /* EXCEPTION! Some compilers permit more than 72 characters per line. - */ - if (Column > 71) - c = skipLine (); - else + /* EXCEPTION! Some compilers permit more than 72 characters per line. + */ + if (Column > 71) + c = skipLine (); + else #endif - { - c = fileGetc (); - ++Column; + { + c = fileGetc (); + ++Column; + } + if (c == '\n') + { + newline = TRUE; /* need to check for continuation line */ + Column = 0; + } + else if (c == '!' && ! ParsingString) + { + c = skipLine (); + newline = TRUE; /* need to check for continuation line */ + Column = 0; + } + else if (c == '&') /* check for free source form */ + { + const int c2 = fileGetc (); + if (c2 == '\n') + longjmp (Exception, (int) ExceptionFixedFormat); + else + fileUngetc (c2); + } } - if (c == '\n') + while (Column == 0) { - newline = TRUE; /* need to check for continuation line */ - Column = 0; - } - else if (c == '&') /* check for free source form */ - { - const int c2 = fileGetc (); - if (c2 == '\n') - longjmp (Exception, (int) ExceptionFixedFormat); - else - fileUngetc (c2); - } - } - while (Column == 0) - { - type = getLineType (); - switch (type) - { - case LTYPE_UNDETERMINED: - case LTYPE_INVALID: - longjmp (Exception, (int) ExceptionFixedFormat); - break; + type = getLineType (); + switch (type) + { + case LTYPE_UNDETERMINED: + case LTYPE_INVALID: + longjmp (Exception, (int) ExceptionFixedFormat); + break; - case LTYPE_SHORT: break; - case LTYPE_COMMENT: skipLine (); break; + case LTYPE_SHORT: break; + case LTYPE_COMMENT: skipLine (); break; - case LTYPE_EOF: - Column = 6; - if (newline) - c = '\n'; - else - c = EOF; - break; + case LTYPE_EOF: + Column = 6; + if (newline) + c = '\n'; + else + c = EOF; + break; - case LTYPE_INITIAL: - if (newline) - { - c = '\n'; - Column = 6; - break; + case LTYPE_INITIAL: + if (newline) + { + c = '\n'; + Column = 6; + break; + } + /* fall through to next case */ + case LTYPE_CONTINUATION: + Column = 5; + do + { + c = fileGetc (); + ++Column; + } while (isBlank (c)); + if (c == '\n') + Column = 0; + else if (Column > 6) + { + fileUngetc (c); + c = ' '; + } + break; + + default: + Assert ("Unexpected line type" == NULL); } - /* fall through to next case */ - case LTYPE_CONTINUATION: - Column = 5; - do - { - c = fileGetc (); - ++Column; - } while (isBlank (c)); - if (c == '\n') - Column = 0; - else if (Column > 6) - { - fileUngetc (c); - c = ' '; - } - break; - - default: - Assert ("Unexpected line type" == NULL); } - } - return c; + return c; } static int skipToNextLine (void) { - int c = skipLine (); - if (c != EOF) - c = fileGetc (); - return c; + int c = skipLine (); + if (c != EOF) + c = fileGetc (); + return c; } static int getFreeFormChar (void) { - static boolean newline = TRUE; - boolean recurse = FALSE; - int c = fileGetc (); + static boolean newline = TRUE; + boolean advanceLine = FALSE; + int c = fileGetc (); - if (c == '&') /* handle line continuation */ - { - recurse = TRUE; - c = fileGetc (); - } - else if (newline && (c == '!' || c == '#')) - recurse = TRUE; - while (recurse) - { - while (isspace (c)) - c = fileGetc (); - while (c == '!' || (newline && c == '#')) + /* If the last nonblank, non-comment character of a FORTRAN 90 + * free-format text line is an ampersand then the next non-comment + * line is a continuation line. + */ + if (c == '&') { - c = skipToNextLine (); - newline = TRUE; + do + c = fileGetc (); + while (isspace (c) && c != '\n'); + if (c == '\n') + { + newline = TRUE; + advanceLine = TRUE; + } + else if (c == '!') + advanceLine = TRUE; + else + { + fileUngetc (c); + c = '&'; + } } - if (c == '&') - c = fileGetc (); - else - recurse = FALSE; - } - newline = (boolean) (c == '\n'); - return c; + else if (newline && (c == '!' || c == '#')) + advanceLine = TRUE; + while (advanceLine) + { + while (isspace (c)) + c = fileGetc (); + if (c == '!' || (newline && c == '#')) + { + c = skipToNextLine (); + newline = TRUE; + continue; + } + if (c == '&') + c = fileGetc (); + else + advanceLine = FALSE; + } + newline = (boolean) (c == '\n'); + return c; } static int getChar (void) { - int c; + int c; - if (Ungetc != '\0') - { - c = Ungetc; - Ungetc = '\0'; - } - else if (FreeSourceForm) - c = getFreeFormChar (); - else - c = getFixedFormChar (); - - return c; + if (Ungetc != '\0') + { + c = Ungetc; + Ungetc = '\0'; + } + else if (FreeSourceForm) + c = getFreeFormChar (); + else + c = getFixedFormChar (); + return c; } static void ungetChar (const int c) { - Ungetc = c; + Ungetc = c; } /* If a numeric is passed in 'c', this is used as the first digit of the @@ -629,131 +773,138 @@ */ static vString *parseInteger (int c) { - static vString *string = NULL; + vString *string = vStringNew (); - if (string == NULL) - string = vStringNew (); - vStringClear (string); + if (c == '-') + { + vStringPut (string, c); + c = getChar (); + } + else if (! isdigit (c)) + c = getChar (); + while (c != EOF && isdigit (c)) + { + vStringPut (string, c); + c = getChar (); + } + vStringTerminate (string); - if (c == '-') - { - vStringPut (string, c); - c = getChar (); - } - else if (! isdigit (c)) - c = getChar (); - while (c != EOF && isdigit (c)) - { - vStringPut (string, c); - c = getChar (); - } - vStringTerminate (string); + if (c == '_') + { + do + c = getChar (); + while (c != EOF && isalpha (c)); + } + ungetChar (c); - if (c == '_') - { - do - c = getChar (); - while (c != EOF && isalpha (c)); - } - ungetChar (c); - - return string; + return string; } static vString *parseNumeric (int c) { - static vString *string = NULL; + vString *string = vStringNew (); + vString *integer = parseInteger (c); + vStringCopy (string, integer); + vStringDelete (integer); - if (string == NULL) - string = vStringNew (); - vStringCopy (string, parseInteger (c)); - - c = getChar (); - if (c == '.') - { - vStringPut (string, c); - vStringCat (string, parseInteger ('\0')); c = getChar (); - } - if (tolower (c) == 'e') - { - vStringPut (string, c); - vStringCat (string, parseInteger ('\0')); - } - else - ungetChar (c); + if (c == '.') + { + integer = parseInteger ('\0'); + vStringPut (string, c); + vStringCat (string, integer); + vStringDelete (integer); + c = getChar (); + } + if (tolower (c) == 'e') + { + integer = parseInteger ('\0'); + vStringPut (string, c); + vStringCat (string, integer); + vStringDelete (integer); + } + else + ungetChar (c); - vStringTerminate (string); + vStringTerminate (string); - return string; + return string; } -static void parseString (vString *const string, const int delimeter) +static void parseString (vString *const string, const int delimiter) { - const unsigned long inputLineNumber = getInputLineNumber (); - int c = getChar (); - - while (c != delimeter && c != '\n' && c != EOF) - { - vStringPut (string, c); + const unsigned long inputLineNumber = getInputLineNumber (); + int c; + ParsingString = TRUE; c = getChar (); - } - if (c == '\n' || c == EOF) - { - verbose ("%s: unterminated character string at line %lu\n", - getInputFileName (), inputLineNumber); - if (c == EOF) - longjmp (Exception, (int) ExceptionEOF); - else if (! FreeSourceForm) - longjmp (Exception, (int) ExceptionFixedFormat); - } - vStringTerminate (string); + while (c != delimiter && c != '\n' && c != EOF) + { + vStringPut (string, c); + c = getChar (); + } + if (c == '\n' || c == EOF) + { + verbose ("%s: unterminated character string at line %lu\n", + getInputFileName (), inputLineNumber); + if (c == EOF) + longjmp (Exception, (int) ExceptionEOF); + else if (! FreeSourceForm) + longjmp (Exception, (int) ExceptionFixedFormat); + } + vStringTerminate (string); + ParsingString = FALSE; } /* Read a C identifier beginning with "firstChar" and places it into "name". */ static void parseIdentifier (vString *const string, const int firstChar) { - int c = firstChar; + int c = firstChar; - do - { - vStringPut (string, c); - c = getChar (); - } while (isident (c)); + do + { + vStringPut (string, c); + c = getChar (); + } while (isident (c)); - vStringTerminate (string); - ungetChar (c); /* unget non-identifier character */ + vStringTerminate (string); + ungetChar (c); /* unget non-identifier character */ } -static tokenInfo *newToken (void) +static void checkForLabel (void) { - tokenInfo *const token = xMalloc (1, tokenInfo); + tokenInfo* token = NULL; + int length; + int c; - token->type = TOKEN_UNDEFINED; - token->keyword = KEYWORD_NONE; - token->tag = TAG_UNDEFINED; - token->string = vStringNew (); - token->lineNumber = getSourceLineNumber (); - if (useFile()) - token->filePosition = getInputFilePosition (); - else - token->bufferPosition = getInputBufferPosition (); + do + c = getChar (); + while (isBlank (c)); - return token; + for (length = 0 ; isdigit (c) && length < 5 ; ++length) + { + if (token == NULL) + { + token = newToken (); + token->type = TOKEN_LABEL; + } + vStringPut (token->string, c); + c = getChar (); + } + if (length > 0 && token != NULL) + { + vStringTerminate (token->string); + makeFortranTag (token, TAG_LABEL); + deleteToken (token); + } + ungetChar (c); } -static void deleteToken (tokenInfo *const token) -{ - vStringDelete (token->string); - eFree (token); -} - /* Analyzes the identifier contained in a statement described by the * statement structure and adjusts the structure according the significance * of the identifier. */ -static keywordId analyzeToken (vString *const name) +static keywordId analyzeToken (vString *const name, langType language) { static vString *keyword = NULL; keywordId id; @@ -761,205 +912,253 @@ if (keyword == NULL) keyword = vStringNew (); vStringCopyToLower (keyword, name); - id = (keywordId) lookupKeyword (vStringValue (keyword), getSourceLanguage()); + id = (keywordId) lookupKeyword (vStringValue (keyword), language); return id; } -static void checkForLabel (void) +static void readIdentifier (tokenInfo *const token, const int c) { - tokenInfo* token = NULL; - int length; - int c; - - do - c = getChar (); - while (isBlank (c)); - - for (length = 0 ; isdigit (c) && length < 5 ; ++length) - { - if (token == NULL) + parseIdentifier (token->string, c); + token->keyword = analyzeToken (token->string, Lang_fortran); + if (! isKeyword (token, KEYWORD_NONE)) + token->type = TOKEN_KEYWORD; + else { - token = newToken (); - token->type = TOKEN_LABEL; + token->type = TOKEN_IDENTIFIER; + if (strncmp (vStringValue (token->string), "end", 3) == 0) + { + vString *const sub = vStringNewInit (vStringValue (token->string) + 3); + const keywordId kw = analyzeToken (sub, Lang_fortran); + vStringDelete (sub); + if (kw != KEYWORD_NONE) + { + token->secondary = newToken (); + token->secondary->type = TOKEN_KEYWORD; + token->secondary->keyword = kw; + token->keyword = KEYWORD_end; + } + } } - vStringPut (token->string, c); - c = getChar (); - } - if (length > 0) - { - Assert (token != NULL); - vStringTerminate (token->string); - makeFortranTag (token, TAG_LABEL); - deleteToken (token); - } - ungetChar (c); } static void readToken (tokenInfo *const token) { - int c; + int c; - token->type = TOKEN_UNDEFINED; - token->tag = TAG_UNDEFINED; - token->keyword = KEYWORD_NONE; - vStringClear (token->string); + deleteToken (token->secondary); + token->type = TOKEN_UNDEFINED; + token->tag = TAG_UNDEFINED; + token->keyword = KEYWORD_NONE; + token->secondary = NULL; + vStringClear (token->string); getNextChar: - token->lineNumber = getSourceLineNumber (); - if (useFile()) - token->filePosition = getInputFilePosition (); - else - token->bufferPosition = getInputBufferPosition (); + c = getChar (); - c = getChar (); + token->lineNumber = getSourceLineNumber (); + if (useFile()) + token->filePosition = getInputFilePosition (); + else + token->bufferPosition = getInputBufferPosition (); - switch (c) - { - case EOF: longjmp (Exception, (int) ExceptionEOF); break; - case ' ': goto getNextChar; - case '\t': goto getNextChar; - case ',': token->type = TOKEN_COMMA; break; - case '(': token->type = TOKEN_PAREN_OPEN; break; - case ')': token->type = TOKEN_PAREN_CLOSE; break; - - case '*': - case '/': - case '+': - case '-': - case '=': - case '<': - case '>': + switch (c) { - const char *const operatorChars = "*/+-=<>"; + case EOF: longjmp (Exception, (int) ExceptionEOF); break; + case ' ': goto getNextChar; + case '\t': goto getNextChar; + case ',': token->type = TOKEN_COMMA; break; + case '(': token->type = TOKEN_PAREN_OPEN; break; + case ')': token->type = TOKEN_PAREN_CLOSE; break; + case '%': token->type = TOKEN_PERCENT; break; - do { - vStringPut (token->string, c); - c = getChar (); - } while (strchr (operatorChars, c) != NULL); - ungetChar (c); - vStringTerminate (token->string); - token->type = TOKEN_OPERATOR; - break; - } + case '*': + case '/': + case '+': + case '-': + case '=': + case '<': + case '>': + { + const char *const operatorChars = "*/+=<>"; + do { + vStringPut (token->string, c); + c = getChar (); + } while (strchr (operatorChars, c) != NULL); + ungetChar (c); + vStringTerminate (token->string); + token->type = TOKEN_OPERATOR; + break; + } - case '!': - if (FreeSourceForm) - { - do - c = getChar (); - while (c != '\n'); - } - else - { - skipLine (); - Column = 0; - } - /* fall through to newline case */ - case '\n': - token->type = TOKEN_STATEMENT_END; - if (FreeSourceForm) - checkForLabel (); - break; + case '!': + if (FreeSourceForm) + { + do + c = getChar (); + while (c != '\n' && c != EOF); + } + else + { + skipLine (); + Column = 0; + } + /* fall through to newline case */ + case '\n': + token->type = TOKEN_STATEMENT_END; + if (FreeSourceForm) + checkForLabel (); + break; - case '.': - parseIdentifier (token->string, c); - c = getChar (); - if (c == '.') - { - vStringPut (token->string, c); - vStringTerminate (token->string); - token->type = TOKEN_OPERATOR; - } - else - { - ungetChar (c); - token->type = TOKEN_UNDEFINED; - } - break; + case '.': + parseIdentifier (token->string, c); + c = getChar (); + if (c == '.') + { + vStringPut (token->string, c); + vStringTerminate (token->string); + token->type = TOKEN_OPERATOR; + } + else + { + ungetChar (c); + token->type = TOKEN_UNDEFINED; + } + break; - case ':': - if (getChar () == ':') - token->type = TOKEN_DOUBLE_COLON; - else - token->type = TOKEN_UNDEFINED; - break; + case '"': + case '\'': + parseString (token->string, c); + token->type = TOKEN_STRING; + break; - default: - if (isalpha (c)) - { - parseIdentifier (token->string, c); - token->keyword = analyzeToken (token->string); - if (isKeyword (token, KEYWORD_NONE)) - token->type = TOKEN_IDENTIFIER; - else - token->type = TOKEN_KEYWORD; - } - else if (isdigit (c)) - { - vStringCat (token->string, parseNumeric (c)); - token->type = TOKEN_NUMERIC; - } - else if (c == '"' || c == '\'') - { - parseString (token->string, c); - token->type = TOKEN_STRING; - } - else if (c == ';' && FreeSourceForm) - token->type = TOKEN_STATEMENT_END; - else - token->type = TOKEN_UNDEFINED; - break; - } + case ';': + token->type = TOKEN_STATEMENT_END; + break; + + case ':': + c = getChar (); + if (c == ':') + token->type = TOKEN_DOUBLE_COLON; + else + { + ungetChar (c); + token->type = TOKEN_UNDEFINED; + } + break; + + default: + if (isalpha (c)) + readIdentifier (token, c); + else if (isdigit (c)) + { + vString *numeric = parseNumeric (c); + vStringCat (token->string, numeric); + vStringDelete (numeric); + token->type = TOKEN_NUMERIC; + } + else + token->type = TOKEN_UNDEFINED; + break; + } } +static void readSubToken (tokenInfo *const token) +{ + if (token->secondary == NULL) + { + token->secondary = newToken (); + readToken (token->secondary); + } +} + /* * Scanning functions */ static void skipToToken (tokenInfo *const token, tokenType type) { - while (! isType (token, type) && ! isType (token, TOKEN_STATEMENT_END)) - readToken (token); + while (! isType (token, type) && ! isType (token, TOKEN_STATEMENT_END) && + !(token->secondary != NULL && isType (token->secondary, TOKEN_STATEMENT_END))) + readToken (token); } static void skipPast (tokenInfo *const token, tokenType type) { - skipToToken (token, type); - if (! isType (token, TOKEN_STATEMENT_END)) - readToken (token); + skipToToken (token, type); + if (! isType (token, TOKEN_STATEMENT_END)) + readToken (token); } static void skipToNextStatement (tokenInfo *const token) { - do - { - skipToToken (token, TOKEN_STATEMENT_END); - readToken (token); - } while (isType (token, TOKEN_STATEMENT_END)); + do + { + skipToToken (token, TOKEN_STATEMENT_END); + readToken (token); + } while (isType (token, TOKEN_STATEMENT_END)); } +/* skip over parenthesis enclosed contents starting at next token. + * Token is left at the first token following closing parenthesis. If an + * opening parenthesis is not found, `token' is moved to the end of the + * statement. + */ +static void skipOverParens (tokenInfo *const token) +{ + int level = 0; + do { + if (isType (token, TOKEN_STATEMENT_END)) + break; + else if (isType (token, TOKEN_PAREN_OPEN)) + ++level; + else if (isType (token, TOKEN_PAREN_CLOSE)) + --level; + readToken (token); + } while (level > 0); +} + static boolean isTypeSpec (tokenInfo *const token) { - boolean result; - switch (token->keyword) - { - case KEYWORD_integer: - case KEYWORD_real: - case KEYWORD_double: - case KEYWORD_complex: - case KEYWORD_character: - case KEYWORD_logical: - case KEYWORD_type: - result = TRUE; - break; - default: - result = FALSE; - break; - } - return result; + boolean result; + switch (token->keyword) + { + case KEYWORD_byte: + case KEYWORD_integer: + case KEYWORD_real: + case KEYWORD_double: + case KEYWORD_complex: + case KEYWORD_character: + case KEYWORD_logical: + case KEYWORD_record: + case KEYWORD_type: + result = TRUE; + break; + default: + result = FALSE; + break; + } + return result; } +static boolean isSubprogramPrefix (tokenInfo *const token) +{ + boolean result; + switch (token->keyword) + { + case KEYWORD_elemental: + case KEYWORD_pure: + case KEYWORD_recursive: + case KEYWORD_stdcall: + result = TRUE; + break; + default: + result = FALSE; + break; + } + return result; +} + /* type-spec * is INTEGER [kind-selector] * or REAL [kind-selector] is ( etc. ) @@ -973,79 +1172,84 @@ */ static void parseTypeSpec (tokenInfo *const token) { - /* parse type-spec, leaving `token' at first token following type-spec */ - Assert (isTypeSpec (token)); - switch (token->keyword) - { - case KEYWORD_integer: - case KEYWORD_real: - case KEYWORD_complex: - case KEYWORD_character: - case KEYWORD_logical: - readToken (token); - if (isType (token, TOKEN_PAREN_OPEN)) - skipPast (token, TOKEN_PAREN_CLOSE); /* skip kind-selector */ - else if (isType (token, TOKEN_OPERATOR) && - strcmp (vStringValue (token->string), "*") == 0) - { - readToken (token); - readToken (token); - } - break; + /* parse type-spec, leaving `token' at first token following type-spec */ + Assert (isTypeSpec (token)); + switch (token->keyword) + { + case KEYWORD_character: + /* skip char-selector */ + readToken (token); + if (isType (token, TOKEN_OPERATOR) && + strcmp (vStringValue (token->string), "*") == 0) + readToken (token); + if (isType (token, TOKEN_PAREN_OPEN)) + skipOverParens (token); + else if (isType (token, TOKEN_NUMERIC)) + readToken (token); + break; - case KEYWORD_double: - readToken (token); - if (! isKeyword (token, KEYWORD_precision)) - skipToToken (token, TOKEN_STATEMENT_END); - break; - case KEYWORD_type: - readToken (token); - if (isType (token, TOKEN_PAREN_OPEN)) - skipPast (token, TOKEN_PAREN_CLOSE); /* skip type-name */ - else - parseDerivedTypeDef (token); - break; + case KEYWORD_byte: + case KEYWORD_complex: + case KEYWORD_integer: + case KEYWORD_logical: + case KEYWORD_real: + readToken (token); + if (isType (token, TOKEN_PAREN_OPEN)) + skipOverParens (token); /* skip kind-selector */ + if (isType (token, TOKEN_OPERATOR) && + strcmp (vStringValue (token->string), "*") == 0) + { + readToken (token); + readToken (token); + } + break; - default: - skipToToken (token, TOKEN_STATEMENT_END); - break; - } -} + case KEYWORD_double: + readToken (token); + if (isKeyword (token, KEYWORD_complex) || + isKeyword (token, KEYWORD_precision)) + readToken (token); + else + skipToToken (token, TOKEN_STATEMENT_END); + break; -/* skip over parenthesis enclosed contents starting at next token. - * Token refers to first token following closing parenthesis. If an opening - * parenthesis is not found, `token' is moved to the end of the statement. - */ -static void skipOverParens (tokenInfo *const token) -{ - if (isType (token, TOKEN_PAREN_OPEN)) - skipPast (token, TOKEN_PAREN_CLOSE); + case KEYWORD_record: + readToken (token); + if (isType (token, TOKEN_OPERATOR) && + strcmp (vStringValue (token->string), "/") == 0) + { + readToken (token); /* skip to structure name */ + readToken (token); /* skip to '/' */ + readToken (token); /* skip to variable name */ + } + break; + + case KEYWORD_type: + readToken (token); + if (isType (token, TOKEN_PAREN_OPEN)) + skipOverParens (token); /* skip type-name */ + else + parseDerivedTypeDef (token); + break; + + default: + skipToToken (token, TOKEN_STATEMENT_END); + break; + } } static boolean skipStatementIfKeyword (tokenInfo *const token, keywordId keyword) { - boolean result = FALSE; - if (isKeyword (token, keyword)) - { - result = TRUE; - skipToNextStatement (token); - } - return result; + boolean result = FALSE; + if (isKeyword (token, keyword)) + { + result = TRUE; + skipToNextStatement (token); + } + return result; } -static boolean isMatchingEnd (tokenInfo *const token, keywordId keyword) -{ - boolean result = FALSE; - if (isKeyword (token, KEYWORD_end)) - { - readToken (token); - result = (boolean) (isKeyword (token, KEYWORD_NONE) || - isKeyword (token, keyword)); - } - return result; -} - /* parse a list of qualifying specifiers, leaving `token' at first token * following list. Examples of such specifiers are: * [[, attr-spec] ::] @@ -1070,111 +1274,306 @@ */ static void parseQualifierSpecList (tokenInfo *const token) { - do - { - readToken (token); /* should be an attr-spec */ - switch (token->keyword) + do { - case KEYWORD_parameter: - case KEYWORD_allocatable: - case KEYWORD_external: - case KEYWORD_intrinsic: - case KEYWORD_optional: - case KEYWORD_private: - case KEYWORD_pointer: - case KEYWORD_public: - case KEYWORD_save: - case KEYWORD_target: - readToken (token); - break; + readToken (token); /* should be an attr-spec */ + switch (token->keyword) + { + case KEYWORD_parameter: + case KEYWORD_allocatable: + case KEYWORD_external: + case KEYWORD_intrinsic: + case KEYWORD_optional: + case KEYWORD_private: + case KEYWORD_pointer: + case KEYWORD_public: + case KEYWORD_save: + case KEYWORD_target: + readToken (token); + break; - case KEYWORD_dimension: - case KEYWORD_intent: - readToken (token); - skipOverParens (token); - break; + case KEYWORD_dimension: + case KEYWORD_intent: + readToken (token); + skipOverParens (token); + break; - default: skipToToken (token, TOKEN_STATEMENT_END); break; + default: skipToToken (token, TOKEN_STATEMENT_END); break; + } + } while (isType (token, TOKEN_COMMA)); + if (! isType (token, TOKEN_DOUBLE_COLON)) + skipToToken (token, TOKEN_STATEMENT_END); +} + +static tagType variableTagType (void) +{ + tagType result = TAG_VARIABLE; + if (ancestorCount () > 0) + { + const tokenInfo* const parent = ancestorTop (); + switch (parent->tag) + { + case TAG_MODULE: result = TAG_VARIABLE; break; + case TAG_DERIVED_TYPE: result = TAG_COMPONENT; break; + case TAG_FUNCTION: result = TAG_LOCAL; break; + case TAG_SUBROUTINE: result = TAG_LOCAL; break; + default: result = TAG_VARIABLE; break; + } } - } while (isType (token, TOKEN_COMMA)); - if (! isType (token, TOKEN_DOUBLE_COLON)) - skipToToken (token, TOKEN_STATEMENT_END); + return result; } -static boolean localVariableScope (void) +static void parseEntityDecl (tokenInfo *const token) { - boolean result = TRUE; - if (ancestorCount () > 0) - { - const tokenInfo* const parent = ancestorTop (); - result = (boolean) (parent->tag != TAG_MODULE); - } - return result; + Assert (isType (token, TOKEN_IDENTIFIER)); + makeFortranTag (token, variableTagType ()); + readToken (token); + if (isType (token, TOKEN_PAREN_OPEN)) + skipOverParens (token); + if (isType (token, TOKEN_OPERATOR) && + strcmp (vStringValue (token->string), "*") == 0) + { + readToken (token); /* read char-length */ + if (isType (token, TOKEN_PAREN_OPEN)) + skipOverParens (token); + else + readToken (token); + } + if (isType (token, TOKEN_OPERATOR)) + { + if (strcmp (vStringValue (token->string), "/") == 0) + { /* skip over initializations of structure field */ + readToken (token); + skipPast (token, TOKEN_OPERATOR); + } + else if (strcmp (vStringValue (token->string), "=") == 0) + { + while (! isType (token, TOKEN_COMMA) && + ! isType (token, TOKEN_STATEMENT_END)) + { + readToken (token); + if (isType (token, TOKEN_PAREN_OPEN)) + skipOverParens (token); + } + } + } + /* token left at either comma or statement end */ } +static void parseEntityDeclList (tokenInfo *const token) +{ + if (isType (token, TOKEN_PERCENT)) + skipToNextStatement (token); + else while (isType (token, TOKEN_IDENTIFIER) || + (isType (token, TOKEN_KEYWORD) && + !isKeyword (token, KEYWORD_function) && + !isKeyword (token, KEYWORD_subroutine))) + { + /* compilers accept keywoeds as identifiers */ + if (isType (token, TOKEN_KEYWORD)) + token->type = TOKEN_IDENTIFIER; + parseEntityDecl (token); + if (isType (token, TOKEN_COMMA)) + readToken (token); + else if (isType (token, TOKEN_STATEMENT_END)) + { + skipToNextStatement (token); + break; + } + } +} + /* type-declaration-stmt is * type-spec [[, attr-spec] ... ::] entity-decl-list */ static void parseTypeDeclarationStmt (tokenInfo *const token) { - const tagType tag = localVariableScope () ? TAG_LOCAL : TAG_VARIABLE; - Assert (isTypeSpec (token)); - parseTypeSpec (token); - if (isType (token, TOKEN_COMMA)) - parseQualifierSpecList (token); - if (isType (token, TOKEN_DOUBLE_COLON)) - readToken (token); - do - { - if (isType (token, TOKEN_IDENTIFIER)) - makeFortranTag (token, tag); - skipPast (token, TOKEN_COMMA); - } while (! isType (token, TOKEN_STATEMENT_END)); - skipToNextStatement (token); + Assert (isTypeSpec (token)); + parseTypeSpec (token); + if (!isType (token, TOKEN_STATEMENT_END)) /* if not end of derived type... */ + { + if (isType (token, TOKEN_COMMA)) + parseQualifierSpecList (token); + if (isType (token, TOKEN_DOUBLE_COLON)) + readToken (token); + parseEntityDeclList (token); + } + if (isType (token, TOKEN_STATEMENT_END)) + skipToNextStatement (token); } -static void parseParenName (tokenInfo *const token) +/* namelist-stmt is + * NAMELIST /namelist-group-name/ namelist-group-object-list + * [[,]/[namelist-group-name]/ namelist-block-object-list] ... + * + * namelist-group-object is + * variable-name + * + * common-stmt is + * COMMON [/[common-block-name]/] common-block-object-list + * [[,]/[common-block-name]/ common-block-object-list] ... + * + * common-block-object is + * variable-name [ ( explicit-shape-spec-list ) ] + */ +static void parseCommonNamelistStmt (tokenInfo *const token, tagType type) { - readToken (token); - if (isType (token, TOKEN_PAREN_OPEN)) + Assert (isKeyword (token, KEYWORD_common) || + isKeyword (token, KEYWORD_namelist)); readToken (token); + do + { + if (isType (token, TOKEN_OPERATOR) && + strcmp (vStringValue (token->string), "/") == 0) + { + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + { + makeFortranTag (token, type); + readToken (token); + } + skipPast (token, TOKEN_OPERATOR); + } + if (isType (token, TOKEN_IDENTIFIER)) + makeFortranTag (token, TAG_LOCAL); + readToken (token); + if (isType (token, TOKEN_PAREN_OPEN)) + skipOverParens (token); /* skip explicit-shape-spec-list */ + if (isType (token, TOKEN_COMMA)) + readToken (token); + } while (! isType (token, TOKEN_STATEMENT_END)); + skipToNextStatement (token); } -/* common-stmt is - * COMMON [/[common-block-name]/] common-block-object-list [[,]/[common-block-name]/ common-block-object-list] ... +static void parseFieldDefinition (tokenInfo *const token) +{ + if (isTypeSpec (token)) + parseTypeDeclarationStmt (token); + else if (isKeyword (token, KEYWORD_structure)) + parseStructureStmt (token); + else if (isKeyword (token, KEYWORD_union)) + parseUnionStmt (token); + else + skipToNextStatement (token); +} + +static void parseMap (tokenInfo *const token) +{ + Assert (isKeyword (token, KEYWORD_map)); + skipToNextStatement (token); + while (! isKeyword (token, KEYWORD_end)) + parseFieldDefinition (token); + readSubToken (token); + /* should be at KEYWORD_map token */ + skipToNextStatement (token); +} + +/* UNION + * MAP + * [field-definition] [field-definition] ... + * END MAP + * MAP + * [field-definition] [field-definition] ... + * END MAP + * [MAP + * [field-definition] + * [field-definition] ... + * END MAP] ... + * END UNION + * * * - * common-block-object is - * variable-name [ ( explicit-shape-spec-list ) ] + * Typed data declarations (variables or arrays) in structure declarations + * have the form of normal Fortran typed data declarations. Data items with + * different types can be freely intermixed within a structure declaration. + * + * Unnamed fields can be declared in a structure by specifying the pseudo + * name %FILL in place of an actual field name. You can use this mechanism to + * generate empty space in a record for purposes such as alignment. + * + * All mapped field declarations that are made within a UNION declaration + * share a common location within the containing structure. When initializing + * the fields within a UNION, the final initialization value assigned + * overlays any value previously assigned to a field definition that shares + * that field. */ -static void parseCommonStmt (tokenInfo *const token) +static void parseUnionStmt (tokenInfo *const token) { - Assert (isKeyword (token, KEYWORD_common)); - readToken (token); - do - { - if (isType (token, TOKEN_OPERATOR)) - { - readToken (token); - if (isType (token, TOKEN_IDENTIFIER)) - makeFortranTag (token, TAG_COMMON_BLOCK); - skipPast (token, TOKEN_OPERATOR); - } - if (isType (token, TOKEN_IDENTIFIER)) - makeFortranTag (token, TAG_LOCAL); - skipPast (token, TOKEN_COMMA); - } while (! isType (token, TOKEN_STATEMENT_END)); - skipToNextStatement (token); + Assert (isKeyword (token, KEYWORD_union)); + skipToNextStatement (token); + while (isKeyword (token, KEYWORD_map)) + parseMap (token); + /* should be at KEYWORD_end token */ + readSubToken (token); + /* secondary token should be KEYWORD_end token */ + skipToNextStatement (token); } -static void tagSlashName (tokenInfo *const token, const tagType type) +/* STRUCTURE [/structure-name/] [field-names] + * [field-definition] + * [field-definition] ... + * END STRUCTURE + * + * structure-name + * identifies the structure in a subsequent RECORD statement. + * Substructures can be established within a structure by means of either + * a nested STRUCTURE declaration or a RECORD statement. + * + * field-names + * (for substructure declarations only) one or more names having the + * structure of the substructure being defined. + * + * field-definition + * can be one or more of the following: + * + * Typed data declarations, which can optionally include one or more + * data initialization values. + * + * Substructure declarations (defined by either RECORD statements or + * subsequent STRUCTURE statements). + * + * UNION declarations, which are mapped fields defined by a block of + * statements. The syntax of a UNION declaration is described below. + * + * PARAMETER statements, which do not affect the form of the + * structure. + */ +static void parseStructureStmt (tokenInfo *const token) { - readToken (token); - if (isType (token, TOKEN_OPERATOR)) - { + tokenInfo *name; + Assert (isKeyword (token, KEYWORD_structure)); readToken (token); - if (isType (token, TOKEN_IDENTIFIER)) - makeFortranTag (token, type); - } + if (isType (token, TOKEN_OPERATOR) && + strcmp (vStringValue (token->string), "/") == 0) + { /* read structure name */ + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + makeFortranTag (token, TAG_DERIVED_TYPE); + name = newTokenFrom (token); + skipPast (token, TOKEN_OPERATOR); + } + else + { /* fake out anonymous structure */ + name = newToken (); + name->type = TOKEN_IDENTIFIER; + name->tag = TAG_DERIVED_TYPE; + vStringCopyS (name->string, "anonymous"); + } + while (isType (token, TOKEN_IDENTIFIER)) + { /* read field names */ + makeFortranTag (token, TAG_COMPONENT); + readToken (token); + if (isType (token, TOKEN_COMMA)) + readToken (token); + } + skipToNextStatement (token); + ancestorPush (name); + while (! isKeyword (token, KEYWORD_end)) + parseFieldDefinition (token); + readSubToken (token); + /* secondary token should be KEYWORD_structure token */ + skipToNextStatement (token); + ancestorPop (); + deleteToken (name); } /* specification-stmt @@ -1197,37 +1596,42 @@ */ static boolean parseSpecificationStmt (tokenInfo *const token) { - boolean result = TRUE; - switch (token->keyword) - { - case KEYWORD_common: parseCommonStmt (token); break; + boolean result = TRUE; + switch (token->keyword) + { + case KEYWORD_common: + parseCommonNamelistStmt (token, TAG_COMMON_BLOCK); + break; - case KEYWORD_namelist: - tagSlashName (token, TAG_NAMELIST); - skipToNextStatement (token); - break; + case KEYWORD_namelist: + parseCommonNamelistStmt (token, TAG_NAMELIST); + break; - case KEYWORD_allocatable: - case KEYWORD_data: - case KEYWORD_dimension: - case KEYWORD_equivalence: - case KEYWORD_external: - case KEYWORD_intent: - case KEYWORD_intrinsic: - case KEYWORD_optional: - case KEYWORD_pointer: - case KEYWORD_private: - case KEYWORD_public: - case KEYWORD_save: - case KEYWORD_target: - skipToNextStatement (token); - break; + case KEYWORD_structure: + parseStructureStmt (token); + break; - default: - result = FALSE; - break; - } - return result; + case KEYWORD_allocatable: + case KEYWORD_data: + case KEYWORD_dimension: + case KEYWORD_equivalence: + case KEYWORD_external: + case KEYWORD_intent: + case KEYWORD_intrinsic: + case KEYWORD_optional: + case KEYWORD_pointer: + case KEYWORD_private: + case KEYWORD_public: + case KEYWORD_save: + case KEYWORD_target: + skipToNextStatement (token); + break; + + default: + result = FALSE; + break; + } + return result; } /* component-def-stmt is @@ -1238,19 +1642,13 @@ */ static void parseComponentDefStmt (tokenInfo *const token) { - Assert (isTypeSpec (token)); - parseTypeSpec (token); - if (isType (token, TOKEN_COMMA)) - parseQualifierSpecList (token); - if (isType (token, TOKEN_DOUBLE_COLON)) - readToken (token); - do - { - if (isType (token, TOKEN_IDENTIFIER)) - makeFortranTag (token, TAG_COMPONENT); - skipPast (token, TOKEN_COMMA); - } while (! isType (token, TOKEN_STATEMENT_END)); - readToken (token); + Assert (isTypeSpec (token)); + parseTypeSpec (token); + if (isType (token, TOKEN_COMMA)) + parseQualifierSpecList (token); + if (isType (token, TOKEN_DOUBLE_COLON)) + readToken (token); + parseEntityDeclList (token); } /* derived-type-def is @@ -1262,27 +1660,30 @@ */ static void parseDerivedTypeDef (tokenInfo *const token) { - if (isType (token, TOKEN_COMMA)) - parseQualifierSpecList (token); - if (isType (token, TOKEN_DOUBLE_COLON)) - readToken (token); - if (isType (token, TOKEN_IDENTIFIER)) - makeFortranTag (token, TAG_DERIVED_TYPE); - ancestorPush (token); - skipToNextStatement (token); - if (isKeyword (token, KEYWORD_private) || - isKeyword (token, KEYWORD_sequence)) - { + if (isType (token, TOKEN_COMMA)) + parseQualifierSpecList (token); + if (isType (token, TOKEN_DOUBLE_COLON)) + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + makeFortranTag (token, TAG_DERIVED_TYPE); + ancestorPush (token); skipToNextStatement (token); - } - while (! isMatchingEnd (token, KEYWORD_type)) - { - if (isTypeSpec (token)) - parseComponentDefStmt (token); - else - skipToNextStatement (token); - } - ancestorPop (); + if (isKeyword (token, KEYWORD_private) || + isKeyword (token, KEYWORD_sequence)) + { + skipToNextStatement (token); + } + while (! isKeyword (token, KEYWORD_end)) + { + if (isTypeSpec (token)) + parseComponentDefStmt (token); + else + skipToNextStatement (token); + } + readSubToken (token); + /* secondary token should be KEYWORD_type token */ + skipToToken (token, TOKEN_STATEMENT_END); + ancestorPop (); } /* interface-block @@ -1309,20 +1710,55 @@ */ static void parseInterfaceBlock (tokenInfo *const token) { - readToken (token); - if (isType (token, TOKEN_IDENTIFIER)) - makeFortranTag (token, TAG_INTERFACE); - else if (isKeyword (token, KEYWORD_assignment) || - isKeyword (token, KEYWORD_operator)) - { - parseParenName (token); + tokenInfo *name = NULL; + Assert (isKeyword (token, KEYWORD_interface)); + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + { + makeFortranTag (token, TAG_INTERFACE); + name = newTokenFrom (token); + } + else if (isKeyword (token, KEYWORD_assignment) || + isKeyword (token, KEYWORD_operator)) + { + readToken (token); + if (isType (token, TOKEN_PAREN_OPEN)) + readToken (token); + if (isType (token, TOKEN_OPERATOR)) + { + makeFortranTag (token, TAG_INTERFACE); + name = newTokenFrom (token); + } + } + if (name == NULL) + { + name = newToken (); + name->type = TOKEN_IDENTIFIER; + name->tag = TAG_INTERFACE; + } + ancestorPush (name); + while (! isKeyword (token, KEYWORD_end)) + { + switch (token->keyword) + { + case KEYWORD_function: parseFunctionSubprogram (token); break; + case KEYWORD_subroutine: parseSubroutineSubprogram (token); break; - if (isType (token, TOKEN_OPERATOR)) - makeFortranTag (token, TAG_INTERFACE); - } - while (! isMatchingEnd (token, KEYWORD_interface)) - readToken (token); - skipToNextStatement (token); + default: + if (isSubprogramPrefix (token)) + readToken (token); + else if (isTypeSpec (token)) + parseTypeSpec (token); + else + skipToNextStatement (token); + break; + } + } + readSubToken (token); + /* secondary token should be KEYWORD_interface token */ + skipToNextStatement (token); + ancestorPop (); + deleteToken (name); } /* entry-stmt is @@ -1330,34 +1766,65 @@ */ static void parseEntryStmt (tokenInfo *const token) { - Assert (isKeyword (token, KEYWORD_entry)); - readToken (token); - if (isType (token, TOKEN_IDENTIFIER)) - makeFortranTag (token, TAG_ENTRY_POINT); - skipToNextStatement (token); + Assert (isKeyword (token, KEYWORD_entry)); + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + makeFortranTag (token, TAG_ENTRY_POINT); + skipToNextStatement (token); } - /* stmt-function-stmt is - * function-name ([dummy-arg-name-list]) = scalar-expr - */ +/* stmt-function-stmt is + * function-name ([dummy-arg-name-list]) = scalar-expr + */ static boolean parseStmtFunctionStmt (tokenInfo *const token) { - boolean result = FALSE; - Assert (isType (token, TOKEN_IDENTIFIER)); -#if 0 /* cannot reliably parse this yet */ - makeFortranTag (token, TAG_FUNCTION); + boolean result = FALSE; + Assert (isType (token, TOKEN_IDENTIFIER)); +#if 0 /* cannot reliably parse this yet */ + makeFortranTag (token, TAG_FUNCTION); #endif - readToken (token); - if (isType (token, TOKEN_PAREN_OPEN)) - { - skipOverParens (token); - result = (boolean) (isType (token, TOKEN_OPERATOR) && - strcmp (vStringValue (token->string), "=") == 0); - } - skipToNextStatement (token); - return result; + readToken (token); + if (isType (token, TOKEN_PAREN_OPEN)) + { + skipOverParens (token); + result = (boolean) (isType (token, TOKEN_OPERATOR) && + strcmp (vStringValue (token->string), "=") == 0); + } + skipToNextStatement (token); + return result; } +static boolean isIgnoredDeclaration (tokenInfo *const token) +{ + boolean result; + switch (token->keyword) + { + case KEYWORD_cexternal: + case KEYWORD_cglobal: + case KEYWORD_dllexport: + case KEYWORD_dllimport: + case KEYWORD_external: + case KEYWORD_format: + case KEYWORD_include: + case KEYWORD_inline: + case KEYWORD_parameter: + case KEYWORD_pascal: + case KEYWORD_pexternal: + case KEYWORD_pglobal: + case KEYWORD_static: + case KEYWORD_value: + case KEYWORD_virtual: + case KEYWORD_volatile: + result = TRUE; + break; + + default: + result = FALSE; + break; + } + return result; +} + /* declaration-construct * [derived-type-def] * [interface-block] @@ -1370,29 +1837,38 @@ */ static boolean parseDeclarationConstruct (tokenInfo *const token) { - boolean result = TRUE; - switch (token->keyword) - { - case KEYWORD_entry: parseEntryStmt (token); break; - case KEYWORD_interface: parseInterfaceBlock (token); break; - case KEYWORD_format: skipToNextStatement (token); break; - case KEYWORD_parameter: skipToNextStatement (token); break; - case KEYWORD_include: skipToNextStatement (token); break; - /* derived type handled by parseTypeDeclarationStmt(); */ + boolean result = TRUE; + switch (token->keyword) + { + case KEYWORD_entry: parseEntryStmt (token); break; + case KEYWORD_interface: parseInterfaceBlock (token); break; + case KEYWORD_stdcall: readToken (token); break; + /* derived type handled by parseTypeDeclarationStmt(); */ - default: - if (isTypeSpec (token)) - { - parseTypeDeclarationStmt (token); - result = TRUE; - } - else if (isType (token, TOKEN_IDENTIFIER)) - result = parseStmtFunctionStmt (token); - else - result = parseSpecificationStmt (token); - break; - } - return result; + case KEYWORD_automatic: + readToken (token); + if (isTypeSpec (token)) + parseTypeDeclarationStmt (token); + else + skipToNextStatement (token); + result = TRUE; + break; + + default: + if (isIgnoredDeclaration (token)) + skipToNextStatement (token); + else if (isTypeSpec (token)) + { + parseTypeDeclarationStmt (token); + result = TRUE; + } + else if (isType (token, TOKEN_IDENTIFIER)) + result = parseStmtFunctionStmt (token); + else + result = parseSpecificationStmt (token); + break; + } + return result; } /* implicit-part-stmt @@ -1403,21 +1879,21 @@ */ static boolean parseImplicitPartStmt (tokenInfo *const token) { - boolean result = TRUE; - switch (token->keyword) - { - case KEYWORD_entry: parseEntryStmt (token); break; + boolean result = TRUE; + switch (token->keyword) + { + case KEYWORD_entry: parseEntryStmt (token); break; - case KEYWORD_implicit: - case KEYWORD_include: - case KEYWORD_parameter: - case KEYWORD_format: - skipToNextStatement (token); - break; + case KEYWORD_implicit: + case KEYWORD_include: + case KEYWORD_parameter: + case KEYWORD_format: + skipToNextStatement (token); + break; - default: result = FALSE; break; - } - return result; + default: result = FALSE; break; + } + return result; } /* specification-part is @@ -1425,14 +1901,16 @@ * [implicit-part] (is [implicit-part-stmt] ... [implicit-stmt]) * [declaration-construct] ... */ -static void parseSpecificationPart (tokenInfo *const token) +static boolean parseSpecificationPart (tokenInfo *const token) { - while (skipStatementIfKeyword (token, KEYWORD_use)) - ; - while (parseImplicitPartStmt (token)) - ; - while (parseDeclarationConstruct (token)) - ; + boolean result = FALSE; + while (skipStatementIfKeyword (token, KEYWORD_use)) + result = TRUE; + while (parseImplicitPartStmt (token)) + result = TRUE; + while (parseDeclarationConstruct (token)) + result = TRUE; + return result; } /* block-data is @@ -1442,20 +1920,23 @@ */ static void parseBlockData (tokenInfo *const token) { - Assert (isKeyword (token, KEYWORD_block)); - readToken (token); - if (isKeyword (token, KEYWORD_data)) - { + Assert (isKeyword (token, KEYWORD_block)); readToken (token); - makeFortranTag (token, TAG_BLOCK_DATA); - } - ancestorPush (token); - skipToNextStatement (token); - parseSpecificationPart (token); - while (! isMatchingEnd (token, KEYWORD_block)) - readToken (token); - skipToNextStatement (token); - ancestorPop (); + if (isKeyword (token, KEYWORD_data)) + { + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + makeFortranTag (token, TAG_BLOCK_DATA); + } + ancestorPush (token); + skipToNextStatement (token); + parseSpecificationPart (token); + while (! isKeyword (token, KEYWORD_end)) + skipToNextStatement (token); + readSubToken (token); + /* secondary token should be KEYWORD_NONE or KEYWORD_block token */ + skipToNextStatement (token); + ancestorPop (); } /* internal-subprogram-part is @@ -1469,29 +1950,31 @@ */ static void parseInternalSubprogramPart (tokenInfo *const token) { - boolean done = FALSE; - Assert (isKeyword (token, KEYWORD_contains)); - skipToNextStatement (token); - do - { - switch (token->keyword) + boolean done = FALSE; + if (isKeyword (token, KEYWORD_contains)) + skipToNextStatement (token); + do { - case KEYWORD_function: parseFunctionSubprogram (token); break; - case KEYWORD_subroutine: parseSubroutineSubprogram (token); break; - case KEYWORD_recursive: readToken (token); break; + switch (token->keyword) + { + case KEYWORD_function: parseFunctionSubprogram (token); break; + case KEYWORD_subroutine: parseSubroutineSubprogram (token); break; + case KEYWORD_end: done = TRUE; break; - default: - if (isTypeSpec (token)) - parseTypeSpec (token); - else - done = TRUE; - break; - } - } while (! done); + default: + if (isSubprogramPrefix (token)) + readToken (token); + else if (isTypeSpec (token)) + parseTypeSpec (token); + else + readToken (token); + break; + } + } while (! done); } /* module is - * mudule-stmt (is MODULE module-name) + * module-stmt (is MODULE module-name) * [specification-part] * [module-subprogram-part] * end-module-stmt (is END [MODULE [module-name]]) @@ -1507,23 +1990,25 @@ */ static void parseModule (tokenInfo *const token) { - Assert (isKeyword (token, KEYWORD_module)); - readToken (token); - if (isType (token, TOKEN_IDENTIFIER)) - makeFortranTag (token, TAG_MODULE); - ancestorPush (token); - skipToNextStatement (token); - parseSpecificationPart (token); - if (isKeyword (token, KEYWORD_contains)) - parseInternalSubprogramPart (token); - while (! isMatchingEnd (token, KEYWORD_module)) + Assert (isKeyword (token, KEYWORD_module)); readToken (token); - skipToNextStatement (token); - ancestorPop (); + if (isType (token, TOKEN_IDENTIFIER)) + makeFortranTag (token, TAG_MODULE); + ancestorPush (token); + skipToNextStatement (token); + parseSpecificationPart (token); + if (isKeyword (token, KEYWORD_contains)) + parseInternalSubprogramPart (token); + while (! isKeyword (token, KEYWORD_end)) + skipToNextStatement (token); + readSubToken (token); + /* secondary token should be KEYWORD_NONE or KEYWORD_module token */ + skipToNextStatement (token); + ancestorPop (); } /* execution-part - * executable-contstruct + * executable-construct * * executable-contstruct is * execution-part-construct [execution-part-construct] @@ -1534,32 +2019,72 @@ * or data-stmt * or entry-stmt */ -static void parseExecutionPart (tokenInfo *const token, const keywordId keyword) +static boolean parseExecutionPart (tokenInfo *const token) { - while (! isMatchingEnd (token, keyword)) - { - readToken (token); - if (isKeyword (token, KEYWORD_contains)) - parseInternalSubprogramPart (token); - else if (isKeyword (token, KEYWORD_entry)) - parseEntryStmt (token); - skipOverParens (token); - } - skipToNextStatement (token); + boolean result = FALSE; + boolean done = FALSE; + while (! done) + { + switch (token->keyword) + { + default: + if (isSubprogramPrefix (token)) + readToken (token); + else + skipToNextStatement (token); + result = TRUE; + break; + + case KEYWORD_entry: + parseEntryStmt (token); + result = TRUE; + break; + + case KEYWORD_contains: + case KEYWORD_function: + case KEYWORD_subroutine: + done = TRUE; + break; + + case KEYWORD_end: + readSubToken (token); + if (isSecondaryKeyword (token, KEYWORD_do) || + isSecondaryKeyword (token, KEYWORD_if) || + isSecondaryKeyword (token, KEYWORD_select) || + isSecondaryKeyword (token, KEYWORD_where)) + { + skipToNextStatement (token); + result = TRUE; + } + else + done = TRUE; + break; + } + } + return result; } -static void parseSubprogram (tokenInfo *const token, - const keywordId keyword, const tagType tag) +static void parseSubprogram (tokenInfo *const token, const tagType tag) { - Assert (isKeyword (token, keyword)); - readToken (token); - if (isType (token, TOKEN_IDENTIFIER)) - makeFortranTag (token, tag); - ancestorPush (token); - skipToNextStatement (token); - parseSpecificationPart (token); - parseExecutionPart (token, keyword); - ancestorPop (); + Assert (isKeyword (token, KEYWORD_program) || + isKeyword (token, KEYWORD_function) || + isKeyword (token, KEYWORD_subroutine)); + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + makeFortranTag (token, tag); + ancestorPush (token); + skipToNextStatement (token); + parseSpecificationPart (token); + parseExecutionPart (token); + if (isKeyword (token, KEYWORD_contains)) + parseInternalSubprogramPart (token); + /* should be at KEYWORD_end token */ + readSubToken (token); + /* secondary token should be one of KEYWORD_NONE, KEYWORD_program, + * KEYWORD_function, KEYWORD_function + */ + skipToNextStatement (token); + ancestorPop (); } @@ -1576,7 +2101,7 @@ */ static void parseFunctionSubprogram (tokenInfo *const token) { - parseSubprogram (token, KEYWORD_function, TAG_FUNCTION); + parseSubprogram (token, TAG_FUNCTION); } /* subroutine-subprogram is @@ -1588,7 +2113,7 @@ */ static void parseSubroutineSubprogram (tokenInfo *const token) { - parseSubprogram (token, KEYWORD_subroutine, TAG_SUBROUTINE); + parseSubprogram (token, TAG_SUBROUTINE); } /* main-program is @@ -1600,7 +2125,7 @@ */ static void parseMainProgram (tokenInfo *const token) { - parseSubprogram (token, KEYWORD_program, TAG_PROGRAM); + parseSubprogram (token, TAG_PROGRAM); } /* program-unit @@ -1611,62 +2136,65 @@ */ static void parseProgramUnit (tokenInfo *const token) { - readToken (token); - do - { - if (isType (token, TOKEN_STATEMENT_END)) - readToken (token); - else switch (token->keyword) + readToken (token); + do { - case KEYWORD_block: parseBlockData (token); break; - case KEYWORD_function: parseFunctionSubprogram (token); break; - case KEYWORD_module: parseModule (token); break; - case KEYWORD_program: parseMainProgram (token); break; - case KEYWORD_subroutine: parseSubroutineSubprogram (token); break; - case KEYWORD_recursive: readToken (token); break; - default: - if (isTypeSpec (token)) - parseTypeSpec (token); - else + if (isType (token, TOKEN_STATEMENT_END)) + readToken (token); + else switch (token->keyword) { - parseSpecificationPart (token); - parseExecutionPart (token, KEYWORD_NONE); + case KEYWORD_block: parseBlockData (token); break; + case KEYWORD_end: skipToNextStatement (token); break; + case KEYWORD_function: parseFunctionSubprogram (token); break; + case KEYWORD_module: parseModule (token); break; + case KEYWORD_program: parseMainProgram (token); break; + case KEYWORD_subroutine: parseSubroutineSubprogram (token); break; + + default: + if (isSubprogramPrefix (token)) + readToken (token); + else + { + boolean one = parseSpecificationPart (token); + boolean two = parseExecutionPart (token); + if (! (one || two)) + readToken (token); + } + break; } - break; - } - } while (TRUE); + } while (TRUE); } static boolean findFortranTags (const unsigned int passCount) { - tokenInfo *token; - exception_t exception; - boolean retry; + tokenInfo *token; + exception_t exception; + boolean retry; - Assert (passCount < 3); - Parent = newToken (); - token = newToken (); - FreeSourceForm = (boolean) (passCount > 1); - Column = 0; - exception = (exception_t) setjmp (Exception); - if (exception == ExceptionEOF) - retry = FALSE; - else if (exception == ExceptionFixedFormat && ! FreeSourceForm) - { - verbose ("%s: not fixed source form; retry as free source form\n", - getInputFileName ()); - retry = TRUE; - } - else - { - parseProgramUnit (token); - retry = FALSE; - } - ancestorClear (); - deleteToken (token); - deleteToken (Parent); + Assert (passCount < 3); + Parent = newToken (); + token = newToken (); + FreeSourceForm = (boolean) (passCount > 1); + Column = 0; + exception = (exception_t) setjmp (Exception); + if (exception == ExceptionEOF) + retry = FALSE; + else if (exception == ExceptionFixedFormat && ! FreeSourceForm) + { + verbose ("%s: not fixed source form; retry as free source form\n", + getInputFileName ()); + retry = TRUE; + } + else + { + parseProgramUnit (token); + retry = FALSE; + } + ancestorClear (); + deleteToken (token); + deleteToken (Parent); - return retry; + return retry; } static void initializeFortran (const langType language) @@ -1716,5 +2244,4 @@ def->initialize = initializeF77; return def; } - -/* vi:set tabstop=8 shiftwidth=4: */ +/* vi:set tabstop=4 shiftwidth=4: */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 10 months

SF.net SVN: geany:[3526] trunk

by eht16＠users.sourceforge.net

Revision: 3526 http://geany.svn.sourceforge.net/geany/?rev=3526&view=rev Author: eht16 Date: 2009-01-29 16:29:59 +0000 (Thu, 29 Jan 2009) Log Message: ----------- Add a check for 'libtoolize' (suggested by Greg Smith, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/autogen.sh Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-28 19:55:23 UTC (rev 3525) +++ trunk/ChangeLog 2009-01-29 16:29:59 UTC (rev 3526) @@ -1,3 +1,9 @@ +2009-01-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * autogen.sh: + Add a check for 'libtoolize' (suggested by Greg Smith, thanks). + + 2009-01-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/document.c: Modified: trunk/autogen.sh =================================================================== --- trunk/autogen.sh 2009-01-28 19:55:23 UTC (rev 3525) +++ trunk/autogen.sh 2009-01-29 16:29:59 UTC (rev 3526) @@ -34,6 +34,16 @@ DIE=1 } +(libtoolize --version) < /dev/null > /dev/null 2>&1 || { + (glibtoolize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`libtool' installed." + echo "You can get it from:" + echo " http://www.gnu.org/software/libtool/" + DIE=1 + } +} + (automake --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: You must have \`automake' (1.7 or later) installed." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 10 months

SF.net SVN: geany:[3525] trunk

by eht16＠users.sourceforge.net

Revision: 3525 http://geany.svn.sourceforge.net/geany/?rev=3525&view=rev Author: eht16 Date: 2009-01-28 19:55:23 +0000 (Wed, 28 Jan 2009) Log Message: ----------- Remove the square brackets around Hidden preferences table titles to avoid confusion with section titles in the config file. Add the new hidden pref 'allow_always_save'. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-28 19:30:18 UTC (rev 3524) +++ trunk/ChangeLog 2009-01-28 19:55:23 UTC (rev 3525) @@ -24,6 +24,10 @@ optional, plugins can omit it if not needed. Add a Help button next to the Configure button in the plugin manager dialog to easily open a plugin's documentation if available. + * doc/geany.txt, doc/geany.html: + Remove the square brackets around Hidden preferences table titles to + avoid confusion with section titles in the config file. + Add the new hidden pref 'allow_always_save'. 2009-01-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2009-01-28 19:30:18 UTC (rev 3524) +++ trunk/doc/geany.html 2009-01-28 19:55:23 UTC (rev 3525) @@ -4050,7 +4050,7 @@ </tr> </thead> <tbody valign="top"> -<tr><td>[editor]</td> +<tr><td>Editor related</td> <td> </td> <td> </td> </tr> @@ -4075,10 +4075,12 @@ <td>Whether to allow completion of snippets when editing an existing line (i.e. there is some text after the current cursor -position on the line).</td> +position on the line). Only used when the +keybinding <tt class="docutils literal">Complete snippet</tt> is set to +<tt class="docutils literal">Space</tt>.</td> <td>false</td> </tr> -<tr><td>[interface]</td> +<tr><td>Interface related</td> <td> </td> <td> </td> </tr> @@ -4088,7 +4090,17 @@ available with GTK 2.12 or above).</td> <td>true</td> </tr> -<tr><td>[VTE]</td> +<tr><td>allow_always_save</td> +<td>Whether files can be saved always, even if +they don't have any changes. By default, +the Save buttons and menu items are +disabled when a file is unchanged. When +setting this option to true, the Save +buttons and menu items are always active +and files can be saved.</td> +<td>false</td> +</tr> +<tr><td>VTE related</td> <td> </td> <td> </td> </tr> @@ -4669,7 +4681,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2009-01-22 20:17 UTC. +Generated on: 2009-01-28 19:54 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2009-01-28 19:30:18 UTC (rev 3524) +++ trunk/doc/geany.txt 2009-01-28 19:55:23 UTC (rev 3525) @@ -3579,7 +3579,7 @@ ================================ =========================================== ================== Key Description Default ================================ =========================================== ================== -**[editor]** +**Editor related** brace_match_ltgt Whether to highlight <, > angle brackets. false show_editor_scrollbars Whether to display scrollbars. If set to true false, the horizontal and vertical @@ -3591,12 +3591,21 @@ complete_snippets_whilst_editing Whether to allow completion of snippets false when editing an existing line (i.e. there is some text after the current cursor - position on the line). -**[interface]** + position on the line). Only used when the + keybinding ``Complete snippet`` is set to + ``Space``. +**Interface related** show_symbol_list_expanders Whether to show or hide the small expander true icons on the symbol list treeview (only available with GTK 2.12 or above). -**[VTE]** +allow_always_save Whether files can be saved always, even if false + they don't have any changes. By default, + the Save buttons and menu items are + disabled when a file is unchanged. When + setting this option to true, the Save + buttons and menu items are always active + and files can be saved. +**VTE related** emulation Terminal emulation mode. Only change this xterm if you have VTE termcap files other than ``vte/termcap/xterm``. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 10 months

SF.net SVN: geany:[3524] trunk

by eht16＠users.sourceforge.net

Revision: 3524 http://geany.svn.sourceforge.net/geany/?rev=3524&view=rev Author: eht16 Date: 2009-01-28 19:30:18 +0000 (Wed, 28 Jan 2009) Log Message: ----------- Rename utils_start_browser() in utils_open_browser() and add it to the plugin API. Add plugin symbol plugin_help() which is called by Geany when the plugin should show its documentation (if any). This symbol is optional, plugins can omit it if not needed. Add a Help button next to the Configure button in the plugin manager dialog to easily open a plugin's documentation if available. Modified Paths: -------------- trunk/ChangeLog trunk/doc/pluginsymbols.c trunk/plugins/geanyfunctions.h trunk/src/about.c trunk/src/build.c trunk/src/callbacks.c trunk/src/plugindata.h trunk/src/plugins.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-28 17:57:16 UTC (rev 3523) +++ trunk/ChangeLog 2009-01-28 19:30:18 UTC (rev 3524) @@ -14,6 +14,16 @@ * doc/plugins.dox, plugins/demoplugin.h: Mention necessary header includes in the plugin signal descriptions. Add missing header includes for the demoplugin. + * doc/pluginsymbols.c, plugins/geanyfunctions.h, src/about.c, + src/build.c, src/callbacks.c, src/plugindata.h, src/plugins.c, + src/utils.c, src/utils.h: + Rename utils_start_browser() in utils_open_browser() and add it to + the plugin API. + Add plugin symbol plugin_help() which is called by Geany when the + plugin should show its documentation (if any). This symbol is + optional, plugins can omit it if not needed. + Add a Help button next to the Configure button in the plugin manager + dialog to easily open a plugin's documentation if available. 2009-01-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/doc/pluginsymbols.c =================================================================== --- trunk/doc/pluginsymbols.c 2009-01-28 17:57:16 UTC (rev 3523) +++ trunk/doc/pluginsymbols.c 2009-01-28 19:30:18 UTC (rev 3524) @@ -97,3 +97,9 @@ * everything done in plugin_init() - e.g. destroy menu items, free memory. */ void plugin_cleanup(); +/** Called whenever the plugin should show its documentation (if any). This may open a dialog, + * a browser with a website or a local installed HTML help file(see utils_start_browser()) + * or something else. + * Can be omitted when not needed. */ +void plugin_help(); + Modified: trunk/plugins/geanyfunctions.h =================================================================== --- trunk/plugins/geanyfunctions.h 2009-01-28 17:57:16 UTC (rev 3523) +++ trunk/plugins/geanyfunctions.h 2009-01-28 19:30:18 UTC (rev 3524) @@ -164,6 +164,8 @@ geany_functions->p_utils->str_casecmp #define utils_get_date_time \ geany_functions->p_utils->get_date_time +#define utils_open_browser \ + geany_functions->p_utils->open_browser #define ui_dialog_vbox_new \ geany_functions->p_ui->dialog_vbox_new #define ui_frame_new_with_alignment \ Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2009-01-28 17:57:16 UTC (rev 3523) +++ trunk/src/about.c 2009-01-28 19:30:18 UTC (rev 3524) @@ -442,6 +442,6 @@ static void homepage_clicked(GtkButton *button, gpointer data) { - utils_start_browser(data); + utils_open_browser(data); } Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-01-28 17:57:16 UTC (rev 3523) +++ trunk/src/build.c 2009-01-28 19:30:18 UTC (rev 3524) @@ -1924,7 +1924,7 @@ if (use_builtin) { gchar *uri = g_strconcat("file:///", g_path_skip_root(doc->file_name), NULL); - utils_start_browser(uri); + utils_open_browser(uri); g_free(uri); return TRUE; Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2009-01-28 17:57:16 UTC (rev 3523) +++ trunk/src/callbacks.c 2009-01-28 19:30:18 UTC (rev 3524) @@ -1274,7 +1274,7 @@ uri = g_strconcat(GEANY_HOMEPAGE, "manual/", VERSION, "/index.html", NULL); } - utils_start_browser(uri); + utils_open_browser(uri); g_free(uri); } @@ -1291,7 +1291,7 @@ on_website1_activate (GtkMenuItem *menuitem, gpointer user_data) { - utils_start_browser(GEANY_HOMEPAGE); + utils_open_browser(GEANY_HOMEPAGE); } Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2009-01-28 17:57:16 UTC (rev 3523) +++ trunk/src/plugindata.h 2009-01-28 19:30:18 UTC (rev 3524) @@ -45,7 +45,7 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 129, + GEANY_API_VERSION = 130, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ @@ -353,6 +353,7 @@ GError **error); gint (*str_casecmp) (const gchar *s1, const gchar *s2); gchar* (*get_date_time) (const gchar *format, time_t *time_to_use); + void (*open_browser) (const gchar *uri); } UtilsFuncs; Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2009-01-28 17:57:16 UTC (rev 3523) +++ trunk/src/plugins.c 2009-01-28 19:30:18 UTC (rev 3524) @@ -91,6 +91,7 @@ void (*init) (GeanyData *data); /* Called when the plugin is enabled */ GtkWidget* (*configure) (GtkDialog *dialog); /* plugin configure dialog, optional */ + void (*help) (void); /* Called when the plugin should show some help, optional */ void (*cleanup) (void); /* Called when the plugin is disabled or when Geany exits */ } Plugin; @@ -212,7 +213,8 @@ &utils_spawn_sync, &utils_spawn_async, &utils_str_casecmp, - &utils_get_date_time + &utils_get_date_time, + &utils_open_browser }; static UIUtilsFuncs uiutils_funcs = { @@ -536,6 +538,7 @@ /* store some function pointers for later use */ g_module_symbol(plugin->module, "plugin_configure", (void *) &plugin->configure); + g_module_symbol(plugin->module, "plugin_help", (void *) &plugin->help); g_module_symbol(plugin->module, "plugin_cleanup", (void *) &plugin->cleanup); if (plugin->cleanup == NULL) { @@ -964,7 +967,9 @@ PLUGIN_COLUMN_NAME, PLUGIN_COLUMN_FILE, PLUGIN_COLUMN_PLUGIN, - PLUGIN_N_COLUMNS + PLUGIN_N_COLUMNS, + PM_BUTTON_CONFIGURE, + PM_BUTTON_HELP }; typedef struct @@ -974,6 +979,7 @@ GtkListStore *store; GtkWidget *description_label; GtkWidget *configure_button; + GtkWidget *help_button; } PluginManagerWidgets; @@ -1005,6 +1011,8 @@ gtk_widget_set_sensitive(pm_widgets.configure_button, p->configure != NULL && g_list_find(active_plugin_list, p) != NULL); + gtk_widget_set_sensitive(pm_widgets.help_button, + p->help != NULL && g_list_find(active_plugin_list, p) != NULL); } } } @@ -1032,7 +1040,9 @@ /* unload plugin module */ if (!state) - keybindings_write_to_file(); /* save shortcuts (only need this group, but it doesn't take long) */ + /* save shortcuts (only need this group, but it doesn't take long) */ + keybindings_write_to_file(); + plugin_free(p); /* reload plugin module and initialize it if item is checked */ @@ -1149,7 +1159,7 @@ } -void pm_on_configure_button_clicked(GtkButton *button, gpointer user_data) +void pm_on_plugin_button_clicked(GtkButton *button, gpointer user_data) { GtkTreeModel *model; GtkTreeSelection *selection; @@ -1163,7 +1173,10 @@ if (p != NULL) { - configure_plugin(p); + if (GPOINTER_TO_INT(user_data) == PM_BUTTON_CONFIGURE) + configure_plugin(p); + else if (GPOINTER_TO_INT(user_data) == PM_BUTTON_HELP && p->help != NULL) + p->help(); } } } @@ -1228,8 +1241,13 @@ pm_widgets.configure_button = gtk_button_new_from_stock(GTK_STOCK_PREFERENCES); gtk_widget_set_sensitive(pm_widgets.configure_button, FALSE); g_signal_connect(pm_widgets.configure_button, "clicked", - G_CALLBACK(pm_on_configure_button_clicked), NULL); + G_CALLBACK(pm_on_plugin_button_clicked), GINT_TO_POINTER(PM_BUTTON_CONFIGURE)); + pm_widgets.help_button = gtk_button_new_from_stock(GTK_STOCK_HELP); + gtk_widget_set_sensitive(pm_widgets.help_button, FALSE); + g_signal_connect(pm_widgets.help_button, "clicked", + G_CALLBACK(pm_on_plugin_button_clicked), GINT_TO_POINTER(PM_BUTTON_HELP)); + label2 = gtk_label_new(_("Plugin details:")); gtk_label_set_use_markup(GTK_LABEL(label2), TRUE); gtk_misc_set_alignment(GTK_MISC(label2), 0, 0.5); @@ -1243,13 +1261,14 @@ hbox = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), label2, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(hbox), pm_widgets.help_button, FALSE, FALSE, 4); gtk_box_pack_start(GTK_BOX(hbox), pm_widgets.configure_button, FALSE, FALSE, 0); - label_vbox = gtk_vbox_new(FALSE, 0); + label_vbox = gtk_vbox_new(FALSE, 3); gtk_box_pack_start(GTK_BOX(label_vbox), hbox, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(label_vbox), desc_win, FALSE, FALSE, 0); - vbox2 = gtk_vbox_new(FALSE, 6); + vbox2 = gtk_vbox_new(FALSE, 3); gtk_box_pack_start(GTK_BOX(vbox2), label, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(vbox2), swin, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), label_vbox, FALSE, FALSE, 0); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2009-01-28 17:57:16 UTC (rev 3523) +++ trunk/src/utils.c 2009-01-28 19:30:18 UTC (rev 3524) @@ -59,13 +59,26 @@ #include "utils.h" -void utils_start_browser(const gchar *uri) +/** + * Tries to open the given URI in a browser. + * On Windows, the system's default browser is opened. + * On non-Windows systems, the browser command set in the preferences dialog is used. In case + * that fails or it is unset, @a xdg-open is used as fallback as well as some other known + * browsers. + * + * @param uri The URI to open in the web browser. + **/ +void utils_open_browser(const gchar *uri) { #ifdef G_OS_WIN32 + g_return_if_fail(uri != NULL); win32_open_browser(uri); #else - gchar *cmdline = g_strconcat(tool_prefs.browser_cmd, " ", uri, NULL); + gchar *cmdline; + g_return_if_fail(uri != NULL); + + cmdline = g_strconcat(tool_prefs.browser_cmd, " ", uri, NULL); if (! g_spawn_command_line_async(cmdline, NULL)) { const gchar *argv[3]; Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2009-01-28 17:57:16 UTC (rev 3523) +++ trunk/src/utils.h 2009-01-28 19:30:18 UTC (rev 3524) @@ -54,7 +54,7 @@ ptr < &ptr_array->pdata[ptr_array->len]; ++ptr, item = *ptr) -void utils_start_browser(const gchar *uri); +void utils_open_browser(const gchar *uri); gint utils_get_line_endings(const gchar* buffer, glong size); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 10 months

SF.net SVN: geany:[3523] trunk/src/geanywraplabel.c

by eht16＠users.sourceforge.net

Revision: 3523 http://geany.svn.sourceforge.net/geany/?rev=3523&view=rev Author: eht16 Date: 2009-01-28 17:57:16 +0000 (Wed, 28 Jan 2009) Log Message: ----------- Fix wrong header include. Modified Paths: -------------- trunk/src/geanywraplabel.c Modified: trunk/src/geanywraplabel.c =================================================================== --- trunk/src/geanywraplabel.c 2009-01-28 17:55:58 UTC (rev 3522) +++ trunk/src/geanywraplabel.c 2009-01-28 17:57:16 UTC (rev 3523) @@ -27,7 +27,7 @@ */ -#include <gtk/gtklabel.h> +#include <gtk/gtk.h> #include "geanywraplabel.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 10 months

SF.net SVN: geany:[3522] trunk

by eht16＠users.sourceforge.net

Revision: 3522 http://geany.svn.sourceforge.net/geany/?rev=3522&view=rev Author: eht16 Date: 2009-01-28 17:55:58 +0000 (Wed, 28 Jan 2009) Log Message: ----------- Mention necessary header includes in the plugin signal descriptions. Add missing header includes for the demoplugin. Modified Paths: -------------- trunk/ChangeLog trunk/doc/plugins.dox trunk/plugins/demoplugin.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-28 17:22:34 UTC (rev 3521) +++ trunk/ChangeLog 2009-01-28 17:55:58 UTC (rev 3522) @@ -11,6 +11,9 @@ Use the selection 'changed' signal of the treeview to update the popup menu items and show the popup menu on mouse button press events so right clicking on items will select them first. + * doc/plugins.dox, plugins/demoplugin.h: + Mention necessary header includes in the plugin signal descriptions. + Add missing header includes for the demoplugin. 2009-01-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/doc/plugins.dox =================================================================== --- trunk/doc/plugins.dox 2009-01-28 17:22:34 UTC (rev 3521) +++ trunk/doc/plugins.dox 2009-01-28 17:55:58 UTC (rev 3522) @@ -83,6 +83,9 @@ * @endsignalproto * @signaldesc * Sent when a new %document is created. + * + * You need to include "document.h" for the declaration of GeanyDocument. + * * @param obj a GeanyObject instance, should be ignored. * @param doc the new document. * @param user_data user data. @@ -94,6 +97,9 @@ * @endsignalproto * @signaldesc * Sent when a new %document is opened. + * + * You need to include "document.h" for the declaration of GeanyDocument. + * * @param obj a GeanyObject instance, should be ignored. * @param doc the opened document. * @param user_data user data. @@ -105,6 +111,9 @@ * @endsignalproto * @signaldesc * Sent when a new %document is saved. + * + * You need to include "document.h" for the declaration of GeanyDocument. + * * @param obj a GeanyObject instance, should be ignored. * @param doc the saved document. * @param user_data user data. @@ -116,6 +125,9 @@ * @endsignalproto * @signaldesc * Sent when switching notebook pages. + * + * You need to include "document.h" for the declaration of GeanyDocument. + * * @param obj a GeanyObject instance, should be ignored. * @param doc the current document. * @param user_data user data. @@ -127,6 +139,9 @@ * @endsignalproto * @signaldesc * Sent before closing a document. + * + * You need to include "document.h" for the declaration of GeanyDocument. + * * @param obj a GeanyObject instance, should be ignored. * @param doc the document about to be closed. * @param user_data user data. @@ -176,8 +191,12 @@ * @signaldesc * Sent before the popup menu of the editing widget is shown. This can be used to modify or extend * the popup menu. + * * @note You can add menu items from @c plugin_init() using @c geany->main_widgets->editor_menu, * remembering to destroy them in @c plugin_cleanup(). + * + * You need to include "document.h" for the declaration of GeanyDocument. + * * @param obj a GeanyObject instance, should be ignored. * @param word the current word (in UTF-8 encoding) below the cursor position where the popup menu will be opened. @@ -215,6 +234,9 @@ * care about the return value; make sure to return TRUE only if it is necessary * and in the correct situations. * + * You need to include "editor.h" for the declaration of GeanyEditor and "Scintilla.h" for + * SCNotification. + * * @param obj a GeanyObject instance, should be ignored. * @param editor The current GeanyEditor. * @param nt A pointer to the SCNotification struct which holds additional information for Modified: trunk/plugins/demoplugin.c =================================================================== --- trunk/plugins/demoplugin.c 2009-01-28 17:22:34 UTC (rev 3521) +++ trunk/plugins/demoplugin.c 2009-01-28 17:55:58 UTC (rev 3522) @@ -37,8 +37,11 @@ #include "geany.h" /* for the GeanyApp data type */ #include "support.h" /* for the _() translation macro (see also po/POTFILES.in) */ +#include "editor.h" /* for the declaration of the GeanyEditor struct, not strictly necessary + as it will be also included by plugindata.h */ +#include "document.h" /* for the declaration of the GeanyDocument struct */ #include "ui_utils.h" -#include "Scintilla.h" /* for the SCNotification struct */ +#include "Scintilla.h" /* for the SCNotification struct */ #include "plugindata.h" /* this defines the plugin API */ #include "geanyfunctions.h" /* this wraps geany_functions function pointers */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 10 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2009