The great merge

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

SWIG/Examples/python/variables/.cvsignore

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

SWIG/Examples/python/variables/Makefile

@@ -13,6 +13,7 @@ static::
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_static
 
 clean::
-	rm -f *_wrap* *.o *~ *.so mypython *.pyc .~* core
+	$(MAKE) -f $(TOP)/Makefile python_clean
+	rm -f $(TARGET).py
 
 check: all

SWIG/Examples/python/variables/example.i

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

SWIG/Examples/python/variables/index.html

@@ -69,21 +69,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>