The great merge

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@4141 626c5289-ae23-0410-ae9c-e8d60b6d4f22

SWIG/Examples/ruby/variables/.cvsignore

@@ -0,0 +1,9 @@
+*_wrap.c
+*_wrap.cxx
+example.dll
+example.dsw
+example.ncb
+example.opt
+example.plg
+Release
+Debug

SWIG/Examples/ruby/variables/Makefile

@@ -13,6 +13,6 @@ static::
 	TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static
 
 clean::
-	rm -f *_wrap* *.o *~ *.so myruby .~* core
+	$(MAKE) -f $(TOP)/Makefile ruby_clean
 
 check: all

SWIG/Examples/ruby/variables/example.i

@@ -27,10 +27,10 @@ extern Point            pt;
 
 /* Some read-only variables */
 
-%readonly
+%immutable;
 extern int  status;
 extern char path[256];
-%readwrite
+%mutable;
 
 /* Some helper functions to make it easier to test */
 extern void  print_vars();

SWIG/Examples/ruby/variables/index.html

@@ -68,21 +68,21 @@ Getting the "value" returns a pointer to the global variable.  Setting the value
 
 <h2>Creating read-only variables</h2>
 
-The <tt>%readonly</tt> and <tt>%readwrite</tt> directives can be used to
+The <tt>%immutable</tt> and <tt>%mutable</tt> directives can be used to
 specify a collection of read-only variables.  For example:
 
 <blockquote>
 <pre>
-%readonly
+%immutable;
 int    status;
 double blah;
 ...
-%readwrite
+%mutable;
 </pre>
 </blockquote>
 
-The <tt>%readonly</tt> directive remains in effect until it is explicitly disabled
-using the <tt>%readwrite</tt> directive.
+The <tt>%immutable</tt> directive remains in effect until it is explicitly disabled
+using the <tt>%mutable</tt> directive.
 
 <h2>Comments</h2>
 <ul>

SWIG/Examples/ruby/variables/runme.rb

@@ -25,23 +25,23 @@ Example.name   = "Bill"
 
 puts "Variables (values printed from Ruby)"
 
-print "ivar      = ", Example.ivar, "\n"
-print "svar      = ", Example.svar, "\n"
-print "lvar      = ", Example.lvar, "\n"
-print "uivar     = ", Example.uivar, "\n"
-print "usvar     = ", Example.usvar, "\n"
-print "ulvar     = ", Example.ulvar, "\n"
-print "scvar     = ", Example.scvar, "\n"
-print "ucvar     = ", Example.ucvar, "\n"
-print "fvar      = ", Example.fvar, "\n"
-print "dvar      = ", Example.dvar, "\n"
-print "cvar      = ", Example.cvar, "\n"
-print "strvar    = ", Example.strvar, "\n"
-print "cstrvar   = ", Example.cstrvar, "\n"
-print "iptrvar   = ", Example.iptrvar, "\n"
-print "name      = ", Example.name, "\n"
-print "ptptr     = ", Example.ptptr, " ", Example.Point_print(Example.ptptr), "\n"
-print "pt        = ", Example.pt, " ", Example.Point_print(Example.pt), "\n"
+puts "ivar      = #{Example.ivar}"
+puts "svar      = #{Example.svar}"
+puts "lvar      = #{Example.lvar}"
+puts "uivar     = #{Example.uivar}"
+puts "usvar     = #{Example.usvar}"
+puts "ulvar     = #{Example.ulvar}"
+puts "scvar     = #{Example.scvar}"
+puts "ucvar     = #{Example.ucvar}"
+puts "fvar      = #{Example.fvar}"
+puts "dvar      = #{Example.dvar}"
+puts "cvar      = #{Example.cvar}"
+puts "strvar    = #{Example.strvar}"
+puts "cstrvar   = #{Example.cstrvar}"
+puts "iptrvar   = #{Example.iptrvar}"
+puts "name      = #{Example.name}"
+puts "ptptr     = #{Example.ptptr} (#{Example.Point_print(Example.ptptr)})"
+puts "pt        = #{Example.pt} (#{Example.Point_print(Example.pt)})"
 
 puts "\nVariables (values printed from C)"
 
@@ -66,13 +66,13 @@ rescue NameError
 end
 
 
-print "\nI'm going to try and update a structure variable.\n\n"
+puts "\nI'm going to try and update a structure variable.\n"
 
 Example.pt = Example.ptptr
 
 puts "The new value is"
 Example.pt_print()
-print "You should see the value ", Example.Point_print(Example.ptptr), "\n"
+puts "You should see the value #{Example.Point_print(Example.ptptr)}"