tioga 1.4 → 1.5

data/split/Tioga/pdfs.h

@@ -221,7 +221,7 @@ extern void End_Axis_Standard_State(void);
 extern void Write_gsave(void);
 extern void Write_grestore(void);
 
-PRIVATE void c_private_set_default_font_size(FM *p, double size);
+extern void c_private_set_default_font_size(FM *p, double size);
 
 void Init_Font_Dictionary(void);
 

data/split/Tioga/symbols.h

@@ -22,10 +22,10 @@ PRIVATE void * rb_import_symbol_no_raise(VALUE module,
 		   
 #define DECLARE_SYMBOL(ret_type,name,args) \
   typedef ret_type (*rb_export_##name##_type) args;\
-  PRIVATE rb_export_##name##_type name
+  INTERN rb_export_##name##_type name
 
 #define IMPLEMENT_SYMBOL(name)\
-  PRIVATE rb_export_##name##_type name = 0;
+  INTERN rb_export_##name##_type name = 0;
 
 #define RB_IMPORT_SYMBOL(module, name) \
   name = (rb_export_##name##_type) rb_import_symbol(module, #name)

data/split/extconf.rb

@@ -14,22 +14,22 @@ end
 # and builds Dvector.so
 setup_dir("Dvector", "Dobjects", 
           "Dobjects/Dvector", include) do |l,b,i|
-  b.add_sources("symbols.c")
+#  b.add_sources("symbols.c")
 end
 # the same for Dtable
 setup_dir("Dtable", "Dobjects", 
           "Dobjects/Dtable", include) do |l,b,i|
-  b.add_sources("symbols.c")
+#  b.add_sources("symbols.c")
 end
 
 setup_dir("Flate", "", "Flate", include) do |l,b,i|
-  b.add_sources("symbols.c")
+#  b.add_sources("symbols.c")
 end
 
 
 setup_dir("Function", "Dobjects", 
           "Dobjects/Function", include) do |l,b,i|
-  b.add_sources("symbols.c")
+#  b.add_sources("symbols.c")
 end
 
 
@@ -41,6 +41,7 @@ declare_library("Tioga",
                 "Tioga/lib/FigMkr.rb",
                 "Tioga/lib/FigureConstants.rb",
                 "Tioga/lib/MarkerConstants.rb",
+                "Tioga/lib/maker.rb",
                 "Tioga/lib/irb_tioga.rb",
                 "Tioga/lib/tioga_ui_cmds.rb",
                 "Tioga/lib/tioga_ui.rb",
@@ -48,7 +49,7 @@ declare_library("Tioga",
                 "Tioga/lib/TexPreamble.rb")
 
 declare_binary_library("Tioga/FigureMaker", 
-                       "Tioga/**/*.c", "symbols.c")
+                       "Tioga/**/*.c")
 
 # The preamble stuff:
 custom_rule("Tioga/lib/TexPreamble.rb", 
@@ -84,6 +85,7 @@ have_func("isnan","math.h")
 
 # Installing scripts
 declare_exec 'scripts/tioga'
+declare_exec 'scripts/irb_tioga'
 
 
 if Config::CONFIG["target"] =~ /darwin/i

data/split/namespace.h

@@ -34,14 +34,18 @@
 */
 
 #ifdef __APPLE__
-# define PRIVATE __private_extern__
+# define INTERN __private_extern__
 # define PUBLIC 
 #elif __GNUC__ >= 4 /* we have the visibility attribute */
-# define PRIVATE __attribute__ ((visibility ("hidden"))) 
+# define INTERN __attribute__ ((visibility ("hidden"))) 
 # define PUBLIC __attribute__ ((visibility ("default"))) 
 #else /* not really good */
-# define PRIVATE 
+# define INTERN
 # define PUBLIC 
 #endif /* __APPLE__  and __GNU_C_ >= 4*/
 
+/* In any case, PRIVATE is static */
+
+#define PRIVATE static
+
 #endif

data/split/symbols.c

@@ -39,11 +39,7 @@ static VALUE get_symbol_hash(VALUE module)
   VALUE hash;
   ID mv_id = rb_intern(MV_SYMBOLS);
   if(RTEST(rb_ivar_defined(module, mv_id)))
-    {
-      hash = rb_ivar_get(module, mv_id);
-      Check_Type(hash, T_HASH);
-      return hash;
-    }
+    return rb_ivar_get(module, mv_id);
   else
     {
       /* module variable uninitialized, we need to make sure it's here */
@@ -66,10 +62,6 @@ PRIVATE void * rb_import_symbol_no_raise(VALUE module,
 					 const char * symbol_name)
 {
   VALUE hash = rb_iv_get(module, MV_SYMBOLS);
-  if(TYPE(hash) != T_HASH) 
-    return NULL; /* doesn't fail, but the importing module
-		    should definitely check the return value. Beware
-		    of segfaults ! */
   VALUE symbol = rb_hash_aref(hash, rb_str_new2(symbol_name));
   
   if(TYPE(symbol) == T_FIXNUM || TYPE(symbol) == T_BIGNUM)

data/split/symbols.h

@@ -22,10 +22,10 @@ PRIVATE void * rb_import_symbol_no_raise(VALUE module,
 		   
 #define DECLARE_SYMBOL(ret_type,name,args) \
   typedef ret_type (*rb_export_##name##_type) args;\
-  PRIVATE rb_export_##name##_type name
+  INTERN rb_export_##name##_type name
 
 #define IMPLEMENT_SYMBOL(name)\
-  PRIVATE rb_export_##name##_type name = 0;
+  INTERN rb_export_##name##_type name = 0;
 
 #define RB_IMPORT_SYMBOL(module, name) \
   name = (rb_export_##name##_type) rb_import_symbol(module, #name)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: tioga
 version: !ruby/object:Gem::Version 
-  version: "1.4"
-date: 2007-01-25 00:00:00 +01:00
+  version: "1.5"
+date: 2007-03-17 00:00:00 +01:00
 summary: Tioga - a powerful scientific plotting library
 require_paths: 
 - lib
@@ -29,7 +29,6 @@ post_install_message:
 authors: []
 
 files: 
-- split/symbols.c
 - split/Tioga/pdfcoords.c
 - split/Tioga/makers.c
 - split/Tioga/axes.c
@@ -40,22 +39,14 @@ files:
 - split/Tioga/pdf_font_dicts.c
 - split/Tioga/pdfimage.c
 - split/Tioga/pdftext.c
-- split/Tioga/symbols.c
 - split/Tioga/pdfpath.c
 - split/Tioga/texout.c
-- split/Function/symbols.c
 - split/Function/function.c
 - split/Function/joint_qsort.c
 - split/Dvector/dvector.c
-- split/Dvector/symbols.c
-- split/Dtable/symbols.c
 - split/Dtable/dtable.c
-- split/Flate/symbols.c
 - split/Flate/flate.c
-- split/namespace.h
-- split/defs.h
-- split/symbols.h
-- split/safe_double.h
+- split/symbols.c
 - split/Tioga/pdfs.h
 - split/Tioga/figures.h
 - split/Tioga/symbols.h
@@ -65,34 +56,35 @@ files:
 - split/Tioga/dvector.h
 - split/Tioga/dtable.h
 - split/Tioga/flate.h
-- split/Function/defs.h
 - split/Function/symbols.h
+- split/Function/defs.h
 - split/Function/safe_double.h
 - split/Function/namespace.h
 - split/Function/dvector.h
+- split/namespace.h
+- split/Dvector/include/dvector.h
 - split/Dvector/dvector_intern.h
 - split/Dvector/symbols.h
 - split/Dvector/defs.h
 - split/Dvector/safe_double.h
 - split/Dvector/namespace.h
-- split/Dvector/include/dvector.h
+- split/Dtable/include/dtable.h
 - split/Dtable/dtable_intern.h
 - split/Dtable/symbols.h
 - split/Dtable/defs.h
 - split/Dtable/safe_double.h
 - split/Dtable/namespace.h
 - split/Dtable/dvector.h
-- split/Dtable/include/dtable.h
+- split/defs.h
+- split/Flate/include/flate.h
 - split/Flate/flate_intern.h
 - split/Flate/symbols.h
 - split/Flate/defs.h
 - split/Flate/safe_double.h
 - split/Flate/namespace.h
-- split/Flate/include/flate.h
-- split/extconf.rb
-- split/mkmf2.rb
+- split/symbols.h
+- split/safe_double.h
 - split/Tioga/mk_tioga_sty.rb
-- split/Tioga/extconf.rb
 - split/Tioga/lib/Rectangles.rb
 - split/Tioga/lib/Colorbars.rb
 - split/Tioga/lib/Shading.rb
@@ -109,6 +101,7 @@ files:
 - split/Tioga/lib/X_and_Y_Axes.rb
 - split/Tioga/lib/irb_tioga.rb
 - split/Tioga/lib/Colormaps.rb
+- split/Tioga/lib/maker.rb
 - split/Tioga/lib/tioga_ui.rb
 - split/Tioga/lib/Utils.rb
 - split/Tioga/lib/Figures_and_Plots.rb
@@ -120,18 +113,21 @@ files:
 - split/Tioga/lib/tioga_ui_cmds.rb
 - split/Tioga/lib/Images.rb
 - split/Tioga/lib/Doc.rb
-- split/Tioga/lib/TexPreamble.rb
 - split/Tioga/lib/Titles_and_Labels.rb
 - split/Tioga/lib/Transparency.rb
 - split/Tioga/lib/ColorConstants.rb
-- split/Function/extconf.rb
+- split/Tioga/lib/TexPreamble.rb
+- split/Tioga/extconf.rb
 - split/Function/lib/Function_extras.rb
-- split/Dvector/extconf.rb
+- split/Function/extconf.rb
 - split/Dvector/lib/Numeric_extras.rb
 - split/Dvector/lib/Dvector_extras.rb
-- split/Dtable/extconf.rb
+- split/Dvector/extconf.rb
 - split/Dtable/lib/Dtable_extras.rb
+- split/Dtable/extconf.rb
 - split/Flate/extconf.rb
+- split/extconf.rb
+- split/mkmf2.rb
 - tests/dvector_test.data
 - tests/dtable_test.data
 - tests/tc_Dtable.rb

data/split/Dtable/symbols.c

@@ -1,92 +0,0 @@
-/*
-   Copyright (C) 2006 Vincent Fourmond
-
-   Symbols is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Library Public License as published
-   by the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   Symbols is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with Dvector; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-
-/* Simple code for sharing C symbols across different Ruby libraries */
-
-#include <ruby.h>
-#include <intern.h>
-
-#include <namespace.h>
-
-
-/* MV stands for Module Variable */
-#define MV_SYMBOLS "@_exported_C_symbols"
-/* modified to use instance variables instead of global class variables:
-   this way, children don't overwrite the parent's export table
-*/
-
-
-/* makes sure that the hash is registered for the given
-   module and returns it */
-static VALUE get_symbol_hash(VALUE module)
-{
-  VALUE hash;
-  ID mv_id = rb_intern(MV_SYMBOLS);
-  if(RTEST(rb_ivar_defined(module, mv_id)))
-    {
-      hash = rb_ivar_get(module, mv_id);
-      Check_Type(hash, T_HASH);
-      return hash;
-    }
-  else
-    {
-      /* module variable uninitialized, we need to make sure it's here */
-      hash = rb_hash_new();
-      rb_ivar_set(module, mv_id, hash);
-      return hash;
-    }
-}
-
-/* registers a symbol in the given module. This one is the internal
-   function */
-PRIVATE void rb_export_symbol(VALUE module, const char * symbol_name,
-			    void * symbol)
-{
-  VALUE hash = get_symbol_hash(module);
-  rb_hash_aset(hash, rb_str_new2(symbol_name),LONG2NUM((long) symbol));
-}
-
-PRIVATE void * rb_import_symbol_no_raise(VALUE module, 
-					 const char * symbol_name)
-{
-  VALUE hash = rb_iv_get(module, MV_SYMBOLS);
-  if(TYPE(hash) != T_HASH) 
-    return NULL; /* doesn't fail, but the importing module
-		    should definitely check the return value. Beware
-		    of segfaults ! */
-  VALUE symbol = rb_hash_aref(hash, rb_str_new2(symbol_name));
-  
-  if(TYPE(symbol) == T_FIXNUM || TYPE(symbol) == T_BIGNUM)
-    return (void *) NUM2LONG(symbol);
-  return NULL;
-}
-
-/* same as before, but raises something is the return value is NULL,
-   which is probably best as a default behavior*/
-PRIVATE void * rb_import_symbol(VALUE module, const char * symbol_name)
-{
-  void * symbol = rb_import_symbol_no_raise(module, symbol_name);
-  if(symbol)
-    return symbol;
-  /* we get the name of the module: */
-  VALUE module_name = rb_funcall(module, rb_intern("to_s"), 0);
-  rb_raise(rb_eRuntimeError, "The symbol %s was not found in "
-	   "module %s", symbol_name, 
-	   rb_string_value_cstr(&module_name));
-}

data/split/Dvector/symbols.c

@@ -1,92 +0,0 @@
-/*
-   Copyright (C) 2006 Vincent Fourmond
-
-   Symbols is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Library Public License as published
-   by the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   Symbols is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with Dvector; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-
-/* Simple code for sharing C symbols across different Ruby libraries */
-
-#include <ruby.h>
-#include <intern.h>
-
-#include <namespace.h>
-
-
-/* MV stands for Module Variable */
-#define MV_SYMBOLS "@_exported_C_symbols"
-/* modified to use instance variables instead of global class variables:
-   this way, children don't overwrite the parent's export table
-*/
-
-
-/* makes sure that the hash is registered for the given
-   module and returns it */
-static VALUE get_symbol_hash(VALUE module)
-{
-  VALUE hash;
-  ID mv_id = rb_intern(MV_SYMBOLS);
-  if(RTEST(rb_ivar_defined(module, mv_id)))
-    {
-      hash = rb_ivar_get(module, mv_id);
-      Check_Type(hash, T_HASH);
-      return hash;
-    }
-  else
-    {
-      /* module variable uninitialized, we need to make sure it's here */
-      hash = rb_hash_new();
-      rb_ivar_set(module, mv_id, hash);
-      return hash;
-    }
-}
-
-/* registers a symbol in the given module. This one is the internal
-   function */
-PRIVATE void rb_export_symbol(VALUE module, const char * symbol_name,
-			    void * symbol)
-{
-  VALUE hash = get_symbol_hash(module);
-  rb_hash_aset(hash, rb_str_new2(symbol_name),LONG2NUM((long) symbol));
-}
-
-PRIVATE void * rb_import_symbol_no_raise(VALUE module, 
-					 const char * symbol_name)
-{
-  VALUE hash = rb_iv_get(module, MV_SYMBOLS);
-  if(TYPE(hash) != T_HASH) 
-    return NULL; /* doesn't fail, but the importing module
-		    should definitely check the return value. Beware
-		    of segfaults ! */
-  VALUE symbol = rb_hash_aref(hash, rb_str_new2(symbol_name));
-  
-  if(TYPE(symbol) == T_FIXNUM || TYPE(symbol) == T_BIGNUM)
-    return (void *) NUM2LONG(symbol);
-  return NULL;
-}
-
-/* same as before, but raises something is the return value is NULL,
-   which is probably best as a default behavior*/
-PRIVATE void * rb_import_symbol(VALUE module, const char * symbol_name)
-{
-  void * symbol = rb_import_symbol_no_raise(module, symbol_name);
-  if(symbol)
-    return symbol;
-  /* we get the name of the module: */
-  VALUE module_name = rb_funcall(module, rb_intern("to_s"), 0);
-  rb_raise(rb_eRuntimeError, "The symbol %s was not found in "
-	   "module %s", symbol_name, 
-	   rb_string_value_cstr(&module_name));
-}

data/split/Flate/symbols.c

@@ -1,92 +0,0 @@
-/*
-   Copyright (C) 2006 Vincent Fourmond
-
-   Symbols is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Library Public License as published
-   by the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   Symbols is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with Dvector; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-
-/* Simple code for sharing C symbols across different Ruby libraries */
-
-#include <ruby.h>
-#include <intern.h>
-
-#include <namespace.h>
-
-
-/* MV stands for Module Variable */
-#define MV_SYMBOLS "@_exported_C_symbols"
-/* modified to use instance variables instead of global class variables:
-   this way, children don't overwrite the parent's export table
-*/
-
-
-/* makes sure that the hash is registered for the given
-   module and returns it */
-static VALUE get_symbol_hash(VALUE module)
-{
-  VALUE hash;
-  ID mv_id = rb_intern(MV_SYMBOLS);
-  if(RTEST(rb_ivar_defined(module, mv_id)))
-    {
-      hash = rb_ivar_get(module, mv_id);
-      Check_Type(hash, T_HASH);
-      return hash;
-    }
-  else
-    {
-      /* module variable uninitialized, we need to make sure it's here */
-      hash = rb_hash_new();
-      rb_ivar_set(module, mv_id, hash);
-      return hash;
-    }
-}
-
-/* registers a symbol in the given module. This one is the internal
-   function */
-PRIVATE void rb_export_symbol(VALUE module, const char * symbol_name,
-			    void * symbol)
-{
-  VALUE hash = get_symbol_hash(module);
-  rb_hash_aset(hash, rb_str_new2(symbol_name),LONG2NUM((long) symbol));
-}
-
-PRIVATE void * rb_import_symbol_no_raise(VALUE module, 
-					 const char * symbol_name)
-{
-  VALUE hash = rb_iv_get(module, MV_SYMBOLS);
-  if(TYPE(hash) != T_HASH) 
-    return NULL; /* doesn't fail, but the importing module
-		    should definitely check the return value. Beware
-		    of segfaults ! */
-  VALUE symbol = rb_hash_aref(hash, rb_str_new2(symbol_name));
-  
-  if(TYPE(symbol) == T_FIXNUM || TYPE(symbol) == T_BIGNUM)
-    return (void *) NUM2LONG(symbol);
-  return NULL;
-}
-
-/* same as before, but raises something is the return value is NULL,
-   which is probably best as a default behavior*/
-PRIVATE void * rb_import_symbol(VALUE module, const char * symbol_name)
-{
-  void * symbol = rb_import_symbol_no_raise(module, symbol_name);
-  if(symbol)
-    return symbol;
-  /* we get the name of the module: */
-  VALUE module_name = rb_funcall(module, rb_intern("to_s"), 0);
-  rb_raise(rb_eRuntimeError, "The symbol %s was not found in "
-	   "module %s", symbol_name, 
-	   rb_string_value_cstr(&module_name));
-}