[Pspp-cvs] pspp po/de.po po/pspp.pot src/data/data-in.c sr...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   06/07/04 04:39:05

Modified files:
        po             : de.po pspp.pot 
        src/data       : data-in.c 
        src/language   : line-buffer.c line-buffer.h 
        src/language/expressions: helpers.c 
        src/libpspp    : message.c message.h 
        src/math       : automake.mk 
        src/ui/gui     : message-dialog.c 
        src/ui/terminal: msg-ui.c 

Log message:
        Encapsulated msg_location inside msg_emit

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/po/pspp.pot?cvsroot=pspp&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/data-in.c?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/line-buffer.c?cvsroot=pspp&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/line-buffer.h?cvsroot=pspp&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/helpers.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/message.c?cvsroot=pspp&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/message.h?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/src/math/automake.mk?cvsroot=pspp&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/message-dialog.c?cvsroot=pspp&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/msg-ui.c?cvsroot=pspp&r1=1.2&r2=1.3

Patches:
Index: po/de.po
===================================================================
RCS file: /sources/pspp/pspp/po/de.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/de.po    4 Jul 2006 01:24:59 -0000       1.6
+++ po/de.po    4 Jul 2006 04:39:04 -0000       1.7
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: PSPP 0.4.2\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-07-04 09:03+0800\n"
+"POT-Creation-Date: 2006-07-04 10:49+0800\n"
 "PO-Revision-Date: 2006-05-26 17:49+0800\n"
 "Last-Translator: John Darrington <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"

Index: po/pspp.pot
===================================================================
RCS file: /sources/pspp/pspp/po/pspp.pot,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- po/pspp.pot 4 Jul 2006 01:24:59 -0000       1.91
+++ po/pspp.pot 4 Jul 2006 04:39:04 -0000       1.92
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-07-04 09:03+0800\n"
+"POT-Creation-Date: 2006-07-04 10:49+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"

Index: src/data/data-in.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/data-in.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/data/data-in.c  9 Jun 2006 22:51:23 -0000       1.11
+++ src/data/data-in.c  4 Jul 2006 04:39:04 -0000       1.12
@@ -64,7 +64,6 @@
 
   m.category = MSG_DATA;
   m.severity = MSG_ERROR;
-  msg_location (&m.where);
   m.text = ds_cstr (&text);
 
   msg_emit (&m);

Index: src/language/line-buffer.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/line-buffer.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- src/language/line-buffer.c  28 Jun 2006 05:49:03 -0000      1.13
+++ src/language/line-buffer.c  4 Jul 2006 04:39:04 -0000       1.14
@@ -377,6 +377,7 @@
 
 /* File locator stack. */
 static const struct msg_locator **file_loc;
+
 static int nfile_loc, mfile_loc;
 
 /* Close getl. */
@@ -423,10 +424,10 @@
   nfile_loc--;
 }
 
-/* Puts the current file and line number in F, or NULL and -1 if
+/* Puts the current file and line number into LOC, or NULL and -1 if
    none. */
 void
-msg_location (struct msg_locator *loc)
+get_msg_location (struct msg_locator *loc)
 {
   if (nfile_loc)
     *loc = *file_loc[nfile_loc - 1];

Index: src/language/line-buffer.h
===================================================================
RCS file: /sources/pspp/pspp/src/language/line-buffer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/language/line-buffer.h  28 Jun 2006 05:49:03 -0000      1.3
+++ src/language/line-buffer.h  4 Jul 2006 04:39:04 -0000       1.4
@@ -57,10 +57,12 @@
 
 bool getl_read_line (bool *interactive);
 
-void getl_location (const char **, int *);
-
 const char *getl_get_prompt (enum getl_prompt_style);
 void getl_set_prompt (enum getl_prompt_style, const char *);
 void getl_set_prompt_style (enum getl_prompt_style);
 
+struct msg_locator;
+void get_msg_location (struct msg_locator *loc);
+
+
 #endif /* line-buffer.h */

Index: src/language/expressions/helpers.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/expressions/helpers.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/language/expressions/helpers.c  9 Jun 2006 22:51:24 -0000       1.6
+++ src/language/expressions/helpers.c  4 Jul 2006 04:39:04 -0000       1.7
@@ -13,11 +13,8 @@
   struct msg m;
   va_list args;
 
-  /* FIXME: we can do better about saying where the error
-     occurred. */
   m.category = MSG_SYNTAX;
   m.severity = MSG_ERROR;
-  msg_location (&m.where);
   va_start (args, format);
   m.text = xvasprintf (format, args);
   va_end (args);

Index: src/libpspp/message.c
===================================================================
RCS file: /sources/pspp/pspp/src/libpspp/message.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/libpspp/message.c       16 May 2006 13:51:39 -0000      1.3
+++ src/libpspp/message.c       4 Jul 2006 04:39:04 -0000       1.4
@@ -1,5 +1,5 @@
 /* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
    Written by Ben Pfaff <address@hidden>.
 
    This program is free software; you can redistribute it and/or
@@ -37,6 +37,8 @@
 
 /* Message handler as set by msg_init(). */
 static void (*msg_handler) (const struct msg *);
+static void (*msg_location) (struct msg_locator *);
+
 
 /* Public functions. */
 
@@ -50,7 +52,6 @@
 
   m.category = msg_class_to_category (class);
   m.severity = msg_class_to_severity (class);
-  msg_location (&m.where);
   va_start (args, format);
   m.text = xvasprintf (format, args);
   va_end (args);
@@ -59,9 +60,11 @@
 }
 
 void
-msg_init (void (*handler) (const struct msg *)) 
+msg_init ( void (*handler) (const struct msg *), 
+          void (*location) (struct msg_locator *) ) 
 {
   msg_handler = handler;
+  msg_location = location;
 }
 
 void
@@ -95,6 +98,7 @@
 void
 msg_emit (struct msg *m) 
 {
+  msg_location (&m->where);
   msg_handler (m);
   free (m->text);
 }

Index: src/libpspp/message.h
===================================================================
RCS file: /sources/pspp/pspp/src/libpspp/message.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/libpspp/message.h       4 May 2006 10:09:32 -0000       1.10
+++ src/libpspp/message.h       4 Jul 2006 04:39:04 -0000       1.11
@@ -86,7 +86,9 @@
   };
 
 /* Initialization. */
-void msg_init (void (*handler) (const struct msg *));
+void msg_init ( void (*handler) (const struct msg *), 
+               void (*location) (struct msg_locator *) ) ;
+
 void msg_done (void);
 
 struct msg * msg_dup(const struct msg *m);
@@ -102,7 +104,7 @@
 const char *msg_get_command_name (void);
 void msg_push_msg_locator (const struct msg_locator *);
 void msg_pop_msg_locator (const struct msg_locator *);
-void msg_location (struct msg_locator *);
+
 
 /* Used in panic situations only. */
 void request_bug_report_and_abort (const char *msg);

Index: src/math/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/src/math/automake.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/math/automake.mk        19 May 2006 20:05:59 -0000      1.3
+++ src/math/automake.mk        4 Jul 2006 04:39:04 -0000       1.4
@@ -1,5 +1,6 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
+include $(top_srcdir)/src/math/ts/automake.mk
 include $(top_srcdir)/src/math/linreg/automake.mk
 
 noinst_LIBRARIES += src/math/libpspp_math.a

Index: src/ui/gui/message-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/message-dialog.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- src/ui/gui/message-dialog.c 3 Jun 2006 03:24:21 -0000       1.13
+++ src/ui/gui/message-dialog.c 4 Jul 2006 04:39:05 -0000       1.14
@@ -43,16 +43,25 @@
 
 
 
-static void enqueue_msg(const struct msg *m);
+static void enqueue_msg (const struct msg *m);
 
 
 static GQueue *message_queue;
 
+
+static void 
+msg_location (struct msg_locator *loc)
+{
+  loc->file_name = NULL; 
+  loc->line_number = -1;
+}
+
+
 void
 message_dialog_init (void) 
 {
   message_queue = g_queue_new();
-  msg_init(enqueue_msg);
+  msg_init (enqueue_msg, msg_location);
 }
 
 
@@ -155,13 +164,3 @@
   gtk_widget_destroy (dialog);
 }
 
-/* FIXME: This is a stub .
- * A temporary workaround until getl.c is rearranged
- */
-void
-msg_location (struct msg_locator *loc)
-{
-       loc->file_name = 0;
-       loc->line_number = -1;
-}
-

Index: src/ui/terminal/msg-ui.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/terminal/msg-ui.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/ui/terminal/msg-ui.c    9 Jun 2006 22:51:24 -0000       1.2
+++ src/ui/terminal/msg-ui.c    4 Jul 2006 04:39:05 -0000       1.3
@@ -41,7 +41,7 @@
 void
 msg_ui_init (void) 
 {
-  msg_init (handle_msg);
+  msg_init (handle_msg, get_msg_location);
 }
 
 void
@@ -50,6 +50,7 @@
   msg_done ();
 }
 
+
 /* Checks whether we've had so many errors that it's time to quit
    processing this syntax file. */
 void