[svn:parrot] r38693 - in trunk: . config/gen/makefiles examples/opengl examples/pir examples/tutorial runtime/parrot/library runtime/parrot/library/Data runtime/parrot/library/Data/Dumper runtime/parrot/library/Digest runtime/parrot/library/Getopt runtime/parrot/library/HTTP runtime/parrot/library/Math runtime/parrot/library/NCI runtime/parrot/library/Parrot runtime/parrot/library/Test runtime/parrot/library/Test/Builder runtime/parrot/library/YAML runtime/parrot/library/YAML/Dumper

NotFound at svn.parrot.org NotFound at svn.parrot.org
Mon May 11 18:45:07 UTC 2009


Author: NotFound
Date: Mon May 11 18:45:05 2009
New Revision: 38693
URL: https://trac.parrot.org/parrot/changeset/38693

Log:
[cage] drop all remaining load_bytecode library/ prefixes except in examples/sdl, fix OpenGL usage of include instead of load_bytecode and replace some .pir with his corresponding .pbc

Modified:
   trunk/MANIFEST.generated
   trunk/config/gen/makefiles/root.in
   trunk/examples/opengl/shapes.pir
   trunk/examples/opengl/static-triangle.pir
   trunk/examples/opengl/triangle.pir
   trunk/examples/pir/sudoku.pir
   trunk/examples/tutorial/90_writing_tests.pir
   trunk/runtime/parrot/library/Data/Dumper.pir
   trunk/runtime/parrot/library/Data/Dumper/Default.pir
   trunk/runtime/parrot/library/Data/Replace.pir
   trunk/runtime/parrot/library/Digest/MD5.pir
   trunk/runtime/parrot/library/Getopt/Obj.pir
   trunk/runtime/parrot/library/HTTP/Daemon.pir
   trunk/runtime/parrot/library/Math/Rand.pir
   trunk/runtime/parrot/library/NCI/call_toolkit_init.pir
   trunk/runtime/parrot/library/OpenGL.pir
   trunk/runtime/parrot/library/Parrot/Coroutine.pir
   trunk/runtime/parrot/library/Test/Builder.pir
   trunk/runtime/parrot/library/Test/Builder/Tester.pir
   trunk/runtime/parrot/library/Test/More.pir
   trunk/runtime/parrot/library/YAML/Dumper.pir
   trunk/runtime/parrot/library/YAML/Dumper/Default.pir
   trunk/runtime/parrot/library/pcre.pir
   trunk/runtime/parrot/library/tcpstream.pir

Modified: trunk/MANIFEST.generated
==============================================================================
--- trunk/MANIFEST.generated	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/MANIFEST.generated	Mon May 11 18:45:05 2009	(r38693)
@@ -144,6 +144,7 @@
 runtime/parrot/library/NCI/call_toolkit_init.pbc  [main]
 runtime/parrot/library/ncurses.pbc                [main]
 runtime/parrot/library/OpenGL_funcs.pir           [main]
+runtime/parrot/library/OpenGL_funcs.pbc           [main]
 runtime/parrot/library/OpenGL.pbc                 [main]
 runtime/parrot/library/P6object.pbc               [main]
 runtime/parrot/library/Parrot/Capture_PIR.pbc     [main]

Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/config/gen/makefiles/root.in	Mon May 11 18:45:05 2009	(r38693)
@@ -259,6 +259,7 @@
     $(LIBRARY_DIR)/NCI/call_toolkit_init.pbc \
     $(LIBRARY_DIR)/ncurses.pbc \
 #IF(has_opengl):    $(LIBRARY_DIR)/OpenGL.pbc \
+#IF(has_opengl):    $(LIBRARY_DIR)/OpenGL_funcs.pbc \
     $(LIBRARY_DIR)/P6object.pbc \
     $(LIBRARY_DIR)/parrotlib.pbc \
     $(LIBRARY_DIR)/pcre.pbc \

Modified: trunk/examples/opengl/shapes.pir
==============================================================================
--- trunk/examples/opengl/shapes.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/examples/opengl/shapes.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -68,8 +68,8 @@
     .param string window_title
 
     # Load OpenGL libary and a helper library for calling glutInit
-    load_bytecode 'library/OpenGL.pbc'
-    load_bytecode 'library/NCI/call_toolkit_init.pbc'
+    load_bytecode 'OpenGL.pbc'
+    load_bytecode 'NCI/call_toolkit_init.pbc'
 
     # Import all OpenGL/GLU/GLUT functions
     .local pmc import_gl

Modified: trunk/examples/opengl/static-triangle.pir
==============================================================================
--- trunk/examples/opengl/static-triangle.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/examples/opengl/static-triangle.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -29,8 +29,8 @@
     .param pmc argv
 
     # Load OpenGL libary and a helper library for calling glutInit
-    load_bytecode 'library/OpenGL.pbc'
-    load_bytecode 'library/NCI/call_toolkit_init.pbc'
+    load_bytecode 'OpenGL.pbc'
+    load_bytecode 'NCI/call_toolkit_init.pbc'
 
     # Import all OpenGL/GLU/GLUT functions
     .local pmc import_gl

Modified: trunk/examples/opengl/triangle.pir
==============================================================================
--- trunk/examples/opengl/triangle.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/examples/opengl/triangle.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -32,8 +32,8 @@
     .param pmc argv
 
     # Load OpenGL libary and a helper library for calling glutInit
-    load_bytecode 'library/OpenGL.pbc'
-    load_bytecode 'library/NCI/call_toolkit_init.pbc'
+    load_bytecode 'OpenGL.pbc'
+    load_bytecode 'NCI/call_toolkit_init.pbc'
 
     # Import all OpenGL/GLU/GLUT functions
     .local pmc import_gl

Modified: trunk/examples/pir/sudoku.pir
==============================================================================
--- trunk/examples/pir/sudoku.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/examples/pir/sudoku.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -2149,7 +2149,7 @@
 
 .sub nc_start
     .local pmc stdscr
-    load_bytecode "library/ncurses.pasm"
+    load_bytecode 'ncurses.pbc'
     stdscr = _init_curses()
     .return(stdscr)
 .end

Modified: trunk/examples/tutorial/90_writing_tests.pir
==============================================================================
--- trunk/examples/tutorial/90_writing_tests.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/examples/tutorial/90_writing_tests.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -12,7 +12,7 @@
 =cut
 
 .sub _main :main
-    load_bytecode 'library/Test/More.pbc'
+    load_bytecode 'Test/More.pbc'
 
     .local pmc exports, curr_namespace, test_namespace
     curr_namespace = get_namespace

Modified: trunk/runtime/parrot/library/Data/Dumper.pir
==============================================================================
--- trunk/runtime/parrot/library/Data/Dumper.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/runtime/parrot/library/Data/Dumper.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -9,7 +9,7 @@
     goto END
 
   load_library:
-        load_bytecode "Data/Dumper/Default.pir"
+        load_bytecode "Data/Dumper/Default.pbc"
         newclass $P0, "Data::Dumper"
 END:
     .return ()

Modified: trunk/runtime/parrot/library/Data/Dumper/Default.pir
==============================================================================
--- trunk/runtime/parrot/library/Data/Dumper/Default.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/runtime/parrot/library/Data/Dumper/Default.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -25,7 +25,7 @@
     goto END
 
   create_ddb:
-    load_bytecode "library/Data/Dumper/Base.pir"
+    load_bytecode 'Data/Dumper/Base.pbc'
     get_class $P0, "Data::Dumper::Base"
     subclass $P0, $P0, "Data::Dumper::Default"
 END:

Modified: trunk/runtime/parrot/library/Data/Replace.pir
==============================================================================
--- trunk/runtime/parrot/library/Data/Replace.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/runtime/parrot/library/Data/Replace.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -8,7 +8,7 @@
 
     ...
 
-    load_bytecode "library/Data/Replace.pir"
+    load_bytecode "Data/Replace.pbc"
 
     .local pmc replace
 

Modified: trunk/runtime/parrot/library/Digest/MD5.pir
==============================================================================
--- trunk/runtime/parrot/library/Digest/MD5.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/runtime/parrot/library/Digest/MD5.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -13,13 +13,13 @@
 
 =head1 SYNOPSIS
 
-  load_bytecode "Digest/MD5.pir"
+  load_bytecode "Digest/MD5.pbc"
   $P0 = _md5sum("foo")
   _md5_print($P0)
 
 or
 
-  load_bytecode "Digest/MD5.pir"
+  load_bytecode "Digest/MD5.pbc"
   $P0 = _md5sum("bar")
   $S0 = _md5_hex($P0)
 

Modified: trunk/runtime/parrot/library/Getopt/Obj.pir
==============================================================================
--- trunk/runtime/parrot/library/Getopt/Obj.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/runtime/parrot/library/Getopt/Obj.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -11,7 +11,7 @@
 
     .local string prog_name
     prog_name = shift argv
-    load_bytecode "Getopt/Obj.pir"
+    load_bytecode "Getopt/Obj.pbc"
     .local pmc getopts
     getopts = new "Getopt::Obj"
     getopts."notOptStop"(1)

Modified: trunk/runtime/parrot/library/HTTP/Daemon.pir
==============================================================================
--- trunk/runtime/parrot/library/HTTP/Daemon.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/runtime/parrot/library/HTTP/Daemon.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -7,7 +7,7 @@
 
 =head1 SYNOPSIS
 
-  load_bytecode "HTTP/Daemon.pir"
+  load_bytecode "HTTP/Daemon.pbc"
   opts = new 'Hash'
   opts['LocalPort'] = 1234
   opts['LocalAddr'] = 'localhost'

Modified: trunk/runtime/parrot/library/Math/Rand.pir
==============================================================================
--- trunk/runtime/parrot/library/Math/Rand.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/runtime/parrot/library/Math/Rand.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -34,7 +34,7 @@
 
 =head1 USAGE
 
-    load_bytecode 'library/Math/Rand.pbc'
+    load_bytecode 'Math/Rand.pbc'
     .local pmc rand
     rand = get_global [ 'Math'; 'Rand' ], 'rand'
     .local pmc srand

Modified: trunk/runtime/parrot/library/NCI/call_toolkit_init.pir
==============================================================================
--- trunk/runtime/parrot/library/NCI/call_toolkit_init.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/runtime/parrot/library/NCI/call_toolkit_init.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -11,8 +11,8 @@
         .param pmc argv
 
         # Load this library and the NCI wrapper for the toolkit
-	load_bytecode 'library/NCI/call_toolkit_init.pbc'
-	load_bytecode 'library/FooTK.pbc'
+	load_bytecode 'NCI/call_toolkit_init.pbc'
+	load_bytecode 'FooTK.pbc'
 
 	# Find Subs for toolkit's init function, and this helper routine
         .local pmc fooInit, call_toolkit_init

Modified: trunk/runtime/parrot/library/OpenGL.pir
==============================================================================
--- trunk/runtime/parrot/library/OpenGL.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/runtime/parrot/library/OpenGL.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -18,8 +18,8 @@
     .param pmc argv
 
     # Load OpenGL libary and a helper library for calling glutInit
-    load_bytecode 'library/OpenGL.pbc'
-    load_bytecode 'library/NCI/call_toolkit_init.pbc'
+    load_bytecode 'OpenGL.pbc'
+    load_bytecode 'NCI/call_toolkit_init.pbc'
 
     # Import all OpenGL/GLU/GLUT functions
     .local pmc import_gl
@@ -80,9 +80,6 @@
 
 .namespace ['OpenGL']
 
-.include 'library/OpenGL_funcs.pir'
-
-
 =item _opengl_init()
 
 At module load time, calls the other initialization routines in the proper
@@ -91,6 +88,7 @@
 =cut
 
 .sub _opengl_init :load
+    load_bytecode 'OpenGL_funcs.pbc'
     _load_opengl_libs()
     _wrap_all_opengl_entry_points()
 .end

Modified: trunk/runtime/parrot/library/Parrot/Coroutine.pir
==============================================================================
--- trunk/runtime/parrot/library/Parrot/Coroutine.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/runtime/parrot/library/Parrot/Coroutine.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -9,7 +9,7 @@
 =head1 SYNOPSIS
 
     .sub onload :load
-        load_bytecode 'Parrot/Coroutine.pir'
+        load_bytecode 'Parrot/Coroutine.pbc'
     .end
 
     ## Recursive coroutine to enumerate tree elements.  Each element that is

Modified: trunk/runtime/parrot/library/Test/Builder.pir
==============================================================================
--- trunk/runtime/parrot/library/Test/Builder.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/runtime/parrot/library/Test/Builder.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -7,7 +7,7 @@
 =head1 SYNOPSIS
 
     # load this library
-    load_bytecode 'library/Test/Builder.pbc'
+    load_bytecode 'Test/Builder.pbc'
 
     # create a new Test::Builder object
     .local pmc test
@@ -48,9 +48,9 @@
 .namespace [ 'Test'; 'Builder' ]
 
 .sub '_initialize' :load
-    load_bytecode 'library/Test/Builder/Test.pbc'
-    load_bytecode 'library/Test/Builder/Output.pbc'
-    load_bytecode 'library/Test/Builder/TestPlan.pbc'
+    load_bytecode 'Test/Builder/Test.pbc'
+    load_bytecode 'Test/Builder/Output.pbc'
+    load_bytecode 'Test/Builder/TestPlan.pbc'
 
     .local pmc tb_class
 

Modified: trunk/runtime/parrot/library/Test/Builder/Tester.pir
==============================================================================
--- trunk/runtime/parrot/library/Test/Builder/Tester.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/runtime/parrot/library/Test/Builder/Tester.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -7,7 +7,7 @@
 =head1 SYNOPSIS
 
     # load this library
-    load_bytecode 'library/Test/Builder/Tester.pbc'
+    load_bytecode 'Test/Builder/Tester.pbc'
 
     # grab the subroutines you want to use
     .local pmc plan
@@ -154,7 +154,7 @@
 .namespace [ 'Test'; 'Builder'; 'Tester' ]
 
 .sub _initialize :load
-    load_bytecode 'library/Test/Builder.pbc'
+    load_bytecode 'Test/Builder.pbc'
 
     .local pmc test
     .local pmc output

Modified: trunk/runtime/parrot/library/Test/More.pir
==============================================================================
--- trunk/runtime/parrot/library/Test/More.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/runtime/parrot/library/Test/More.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -7,7 +7,7 @@
 =head1 SYNOPSIS
 
     # load this library
-    load_bytecode 'library/Test/More.pbc'
+    load_bytecode 'Test/More.pbc'
 
     # get the testing functions
     .local pmc exports, curr_namespace, test_namespace
@@ -66,7 +66,7 @@
 .namespace [ 'Test'; 'More' ]
 
 .sub _initialize :load
-    load_bytecode 'library/Test/Builder.pbc'
+    load_bytecode 'Test/Builder.pbc'
 
     .local pmc test
     test = new [ 'Test'; 'Builder' ]

Modified: trunk/runtime/parrot/library/YAML/Dumper.pir
==============================================================================
--- trunk/runtime/parrot/library/YAML/Dumper.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/runtime/parrot/library/YAML/Dumper.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -9,7 +9,7 @@
     goto END
 
   load_library:
-        load_bytecode "library/YAML/Dumper/Default.pir"
+        load_bytecode 'YAML/Dumper/Default.pbc'
         newclass $P0, "YAML::Dumper"
 END:
     .return ()

Modified: trunk/runtime/parrot/library/YAML/Dumper/Default.pir
==============================================================================
--- trunk/runtime/parrot/library/YAML/Dumper/Default.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/runtime/parrot/library/YAML/Dumper/Default.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -25,7 +25,7 @@
     goto END
 
   create_ydb:
-    load_bytecode "library/YAML/Dumper/Base.pir"
+    load_bytecode 'YAML/Dumper/Base.pbc'
     get_class $P0, "YAML::Dumper::Base"
     subclass $P0, $P0, "YAML::Dumper::Default"
 END:

Modified: trunk/runtime/parrot/library/pcre.pir
==============================================================================
--- trunk/runtime/parrot/library/pcre.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/runtime/parrot/library/pcre.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -7,7 +7,7 @@
 
 =head1 SYNOPSIS
 
-    load_bytecode 'library/pcre.pir'
+    load_bytecode 'pcre.pbc'
     lib = pcre_init()
 
     func = get_hll_global ['PCRE'], 'compile'
@@ -81,7 +81,7 @@
 LIB_LOADED:
     set_hll_global ['PCRE'], 'lib', libpcre
 
-    load_bytecode 'library/libpcre.pir'
+    load_bytecode 'libpcre.pbc'
 
     # pcre *pcre_compile(const char *pattern, int options,
     #            const char **errptr, int *erroffset,

Modified: trunk/runtime/parrot/library/tcpstream.pir
==============================================================================
--- trunk/runtime/parrot/library/tcpstream.pir	Mon May 11 17:52:45 2009	(r38692)
+++ trunk/runtime/parrot/library/tcpstream.pir	Mon May 11 18:45:05 2009	(r38693)
@@ -8,7 +8,7 @@
 =head1 SYNOPSIS
 
   .sub main :main
-      load_bytecode 'library/tcpstream.pir'
+      load_bytecode 'tcpstream.pir'
 
       .local pmc stream
       stream = new 'TCPStream'


More information about the parrot-commits mailing list