[svn:mod_parrot] r252 - in mod_parrot/trunk: build/lib/Generator eg lib/APR lib/Apache lib/ModParrot/HLL t/lib

[email protected]
Newsgroups perl.cvs.mod_parrot
Message-ID <[email protected]> 
Author: jhorwitz
Date: Tue Sep 11 10:38:35 2007
New Revision: 252

Modified:
   mod_parrot/trunk/build/lib/Generator/ApacheRequestRec.pm
   mod_parrot/trunk/eg/authenhandler.pir
   mod_parrot/trunk/eg/handler.pir
   mod_parrot/trunk/lib/APR/Table.pir
   mod_parrot/trunk/lib/Apache/Constants.pir
   mod_parrot/trunk/lib/Apache/RequestRec.pir
   mod_parrot/trunk/lib/ModParrot/HLL/pir.pir
   mod_parrot/trunk/t/lib/handlers.pir

Log:
remove deprecated .pcc_(begin|end)_return blocks


Modified: mod_parrot/trunk/build/lib/Generator/ApacheRequestRec.pm
==============================================================================
--- mod_parrot/trunk/build/lib/Generator/ApacheRequestRec.pm	(original)
+++ mod_parrot/trunk/build/lib/Generator/ApacheRequestRec.pm	Tue Sep 11 10:38:35 2007
@@ -138,9 +138,7 @@
     request_rec_%%NAME%% = get_root_global [ '_modparrot'; 'NCI' ], 'request_rec_%%NAME%%'
     %%NAME%% = request_rec_%%NAME%%( r , data, update_r )
 
-    .pcc_begin_return
-        .return %%NAME%%
-    .pcc_end_return
+    .return(%%NAME%%)
 .end
 
 END
@@ -170,9 +168,7 @@
     request_rec_%%NAME%% = get_root_global [ '_modparrot'; 'NCI' ], 'request_rec_%%NAME%%'
     %%NAME%% = request_rec_%%NAME%%( r , data, update_r )
 
-    .pcc_begin_return
-        .return %%NAME%%
-    .pcc_end_return
+    .return(%%NAME%%)
 .end
 
 END

Modified: mod_parrot/trunk/eg/authenhandler.pir
==============================================================================
--- mod_parrot/trunk/eg/authenhandler.pir	(original)
+++ mod_parrot/trunk/eg/authenhandler.pir	Tue Sep 11 10:38:35 2007
@@ -33,7 +33,5 @@
     goto auth_return_status
 
 auth_return_status:
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end 

Modified: mod_parrot/trunk/eg/handler.pir
==============================================================================
--- mod_parrot/trunk/eg/handler.pir	(original)
+++ mod_parrot/trunk/eg/handler.pir	Tue Sep 11 10:38:35 2007
@@ -17,7 +17,5 @@
     # tell apache we're finished
     find_global ap_const, 'Apache::Constants', 'ap_constants'
     $I0 = ap_const['OK']
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end

Modified: mod_parrot/trunk/lib/APR/Table.pir
==============================================================================
--- mod_parrot/trunk/lib/APR/Table.pir	(original)
+++ mod_parrot/trunk/lib/APR/Table.pir	Tue Sep 11 10:38:35 2007
@@ -76,9 +76,7 @@
     apr_table_get = get_root_global [ 'APR'; 'NCI' ], 'apr_table_get'
     val = apr_table_get(t, key)
 
-    .pcc_begin_return
-        .return val
-    .pcc_end_return
+    .return(val)
 .end
 
 =item C<APR::Table set(STRING key, STRING value)>

Modified: mod_parrot/trunk/lib/Apache/Constants.pir
==============================================================================
--- mod_parrot/trunk/lib/Apache/Constants.pir	(original)
+++ mod_parrot/trunk/lib/Apache/Constants.pir	Tue Sep 11 10:38:35 2007
@@ -29,10 +29,7 @@
  find_global $P0, 'Apache::Constants', 'ap_const'
  $I0 = ap_const['OK']
 
- .pcc_begin_return
-     .return $I0
- .pcc_end_return
-
+ .return($I0)
 =head1 AUTHOR
 
 Jeff Horwitz

Modified: mod_parrot/trunk/lib/Apache/RequestRec.pir
==============================================================================
--- mod_parrot/trunk/lib/Apache/RequestRec.pir	(original)
+++ mod_parrot/trunk/lib/Apache/RequestRec.pir	Tue Sep 11 10:38:35 2007
@@ -157,9 +157,7 @@
     ap_rwrite = get_root_global [ '_modparrot'; 'NCI' ], 'rwrite'
     bytes = ap_rwrite( data, size, r )
 
-    .pcc_begin_return
-        .return bytes
-    .pcc_end_return
+    .return(bytes)
 .end
 
 =item C<STRING filename([STRING filename])>
@@ -187,9 +185,7 @@
 CALL_NCI:
     filename = request_rec_filename( r, f, update_r )
 
-    .pcc_begin_return
-        .return filename
-    .pcc_end_return
+    .return(filename)
 .end
 
 =item C<log_rerror(STRING file, INT line, INT level, STRING msg)>
@@ -247,10 +243,7 @@
     status = results[0]
     pw = results[1]
 
-    .pcc_begin_return
-        .return status
-        .return pw
-    .pcc_end_return
+    .return(status, pw)
 .end
 
 =item C<INT is_initial_req()>
@@ -273,9 +266,7 @@
     ap_is_initial_req = get_root_global [ 'Apache'; 'NCI' ], 'ap_is_initial_req'
     $I0 = ap_is_initial_req( r )
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 =item C<STRING auth_name()>
@@ -297,9 +288,7 @@
     ap_auth_name = get_root_global [ 'Apache'; 'NCI' ], 'ap_auth_name'
     $S0 = ap_auth_name( r )
 
-    .pcc_begin_return
-        .return $S0
-    .pcc_end_return
+    .return($S0)
 .end
 
 =item C<note_basic_auth_failure()>
@@ -342,9 +331,7 @@
     ap_auth_type = get_root_global [ 'Apache'; 'NCI' ], 'ap_auth_type'
     $S0 = ap_auth_type( r )
 
-    .pcc_begin_return
-        .return $S0
-    .pcc_end_return
+    .return($S0)
 .end
 
 =item C<PMC notes()>
@@ -373,9 +360,7 @@
     $P1['apr_table'] = notes
     t = new $P0, $P1
 
-    .pcc_begin_return
-        .return t
-    .pcc_end_return
+    .return(t)
 .end
 
 =item C<PMC main()>
@@ -398,9 +383,7 @@
     request_rec_main = get_root_global [ '_modparrot'; 'NCI' ], 'request_rec_main'
     main_r = request_rec_main( r )
 
-    .pcc_begin_return
-        .return main_r
-    .pcc_end_return
+    .return(main_r)
 .end
 
 =item C<PMC next()>
@@ -423,9 +406,7 @@
     request_rec_next = get_root_global [ '_modparrot'; 'NCI' ], 'request_rec_next'
     next_r = request_rec_next( r )
 
-    .pcc_begin_return
-        .return next_r
-    .pcc_end_return
+    .return(next_r)
 .end
 
 =item C<PMC prev()>
@@ -452,9 +433,7 @@
     $P2['r'] = $P1
     prev_r = new $P0, $P2
 
-    .pcc_begin_return
-        .return prev_r
-    .pcc_end_return
+    .return(prev_r)
 .end
 
 =item C<custom_response(INT status, STRING response)>

Modified: mod_parrot/trunk/lib/ModParrot/HLL/pir.pir
==============================================================================
--- mod_parrot/trunk/lib/ModParrot/HLL/pir.pir	(original)
+++ mod_parrot/trunk/lib/ModParrot/HLL/pir.pir	Tue Sep 11 10:38:35 2007
@@ -39,9 +39,7 @@
     status = handler(r)
 
     # return status code
-    .pcc_begin_return
-        .return status
-    .pcc_end_return
+    .return(status)
 .end
 
 # authen handler
@@ -60,9 +58,7 @@
     status = handler(r)
 
     # return status code
-    .pcc_begin_return
-        .return status
-    .pcc_end_return
+    .return(status)
 .end
 
 # authz handler
@@ -81,9 +77,7 @@
     status = handler(r)
 
     # return status code
-    .pcc_begin_return
-        .return status
-    .pcc_end_return
+    .return(status)
 .end
 
 # access handler
@@ -102,9 +96,7 @@
     status = handler(r)
 
     # return status code
-    .pcc_begin_return
-        .return status
-    .pcc_end_return
+    .return(status)
 .end
 
 # open logs handler
@@ -135,9 +127,7 @@
     status = handler(pconf, plog, ptemp, s)
 
     # return status code
-    .pcc_begin_return
-        .return status
-    .pcc_end_return
+    .return(status)
 .end
 
 # post_config handler
@@ -168,9 +158,7 @@
     status = handler(pconf, plog, ptemp, s)
 
     # return status code
-    .pcc_begin_return
-        .return status
-    .pcc_end_return
+    .return(status)
 .end
 
 # child init handler
@@ -195,9 +183,7 @@
     status = handler(pchild, s)
 
     # return status code
-    .pcc_begin_return
-        .return status
-    .pcc_end_return
+    .return(status)
 .end
 
 # pre connection handler
@@ -222,9 +208,7 @@
     status = handler(c, csd)
 
     # return status code
-    .pcc_begin_return
-        .return status
-    .pcc_end_return
+    .return(status)
 .end
 
 # process connection handler
@@ -244,9 +228,7 @@
     status = handler(c)
 
     # return status code
-    .pcc_begin_return
-        .return status
-    .pcc_end_return
+    .return(status)
 .end
 
 # trans handler
@@ -266,9 +248,7 @@
     status = handler(r)
 
     # return status code
-    .pcc_begin_return
-        .return status
-    .pcc_end_return
+    .return(status)
 .end
 
 # fixup handler
@@ -288,9 +268,7 @@
     status = handler(r)
 
     # return status code
-    .pcc_begin_return
-        .return status
-    .pcc_end_return
+    .return(status)
 .end
 
 # type handler
@@ -310,9 +288,7 @@
     status = handler(r)
 
     # return status code
-    .pcc_begin_return
-        .return status
-    .pcc_end_return
+    .return(status)
 .end
 
 # log handler
@@ -332,9 +308,7 @@
     status = handler(r)
 
     # return status code
-    .pcc_begin_return
-        .return status
-    .pcc_end_return
+    .return(status)
 .end
 
 # map_to_storage handler
@@ -354,9 +328,7 @@
     status = handler(r)
 
     # return status code
-    .pcc_begin_return
-        .return status
-    .pcc_end_return
+    .return(status)
 .end
 
 # post_read_request handler
@@ -376,9 +348,7 @@
     status = handler(r)
 
     # return status code
-    .pcc_begin_return
-        .return status
-    .pcc_end_return
+    .return(status)
 .end
 
 # header_parser handler
@@ -397,7 +367,5 @@
     status = handler(r)
 
     # return status code
-    .pcc_begin_return
-        .return status
-    .pcc_end_return
+    .return(status)
 .end

Modified: mod_parrot/trunk/t/lib/handlers.pir
==============================================================================
--- mod_parrot/trunk/t/lib/handlers.pir	(original)
+++ mod_parrot/trunk/t/lib/handlers.pir	Tue Sep 11 10:38:35 2007
@@ -12,9 +12,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::puts' ]
@@ -28,9 +26,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::write' ]
@@ -46,9 +42,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::args' ]
@@ -64,9 +58,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::hostname' ]
@@ -82,9 +74,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::log_rerror' ]
@@ -102,9 +92,7 @@
 
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::get_basic_auth_pw' ]
@@ -118,9 +106,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::AccessHandler' ]
@@ -140,9 +126,7 @@
     $I0 = ap_const['HTTP_FORBIDDEN']
 
 access_done:
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::AuthenHandler' ]
@@ -166,9 +150,7 @@
     $I0 = ap_const['HTTP_UNAUTHORIZED']
 
 auth_done:
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::AuthzHandler' ]
@@ -188,9 +170,7 @@
     $I0 = ap_const['HTTP_FORBIDDEN']
 
 authz_done:
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::HelloWorld' ]
@@ -204,9 +184,7 @@
 
     r.'puts'('Hello World')
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::auth_type' ]
@@ -221,9 +199,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::auth_name' ]
@@ -238,9 +214,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::the_request' ]
@@ -255,9 +229,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::protocol' ]
@@ -272,9 +244,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::status_line' ]
@@ -289,9 +259,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::range' ]
@@ -306,9 +274,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::handler' ]
@@ -323,9 +289,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::content_encoding' ]
@@ -340,9 +304,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::vlist_validator' ]
@@ -357,9 +319,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::unparsed_uri' ]
@@ -374,9 +334,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::uri' ]
@@ -391,9 +349,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::path_info' ]
@@ -408,9 +364,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::assbackwards' ]
@@ -425,9 +379,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
  
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
  
 .namespace [ 'ModParrot::Test::proxyreq' ]
@@ -442,9 +394,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
  
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
  
 .namespace [ 'ModParrot::Test::header_only' ]
@@ -459,9 +409,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
  
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
  
 .namespace [ 'ModParrot::Test::proto_num' ]
@@ -476,9 +424,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
  
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
  
 .namespace [ 'ModParrot::Test::method_number' ]
@@ -493,9 +439,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
  
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
  
 .namespace [ 'ModParrot::Test::chunked' ]
@@ -510,9 +454,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
  
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
  
 .namespace [ 'ModParrot::Test::read_body' ]
@@ -527,9 +469,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
  
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
  
 .namespace [ 'ModParrot::Test::read_chunked' ]
@@ -544,9 +484,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
  
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
  
 .namespace [ 'ModParrot::Test::no_cache' ]
@@ -561,9 +499,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
  
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
  
 .namespace [ 'ModParrot::Test::no_local_copy' ]
@@ -578,9 +514,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
  
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
  
 .namespace [ 'ModParrot::Test::used_path_info' ]
@@ -595,9 +529,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
  
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
  
 .namespace [ 'ModParrot::Test::eos_sent' ]
@@ -612,9 +544,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
  
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::notes' ]
@@ -631,9 +561,7 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
 
 .namespace [ 'ModParrot::Test::status' ]
@@ -647,7 +575,5 @@
     ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
 
-    .pcc_begin_return
-        .return $I0
-    .pcc_end_return
+    .return($I0)
 .end
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.