[svn:parrot] r40096 - in branches/ops_pct: lib/Parrot src/ops

cotto at svn.parrot.org cotto at svn.parrot.org
Wed Jul 15 02:49:18 UTC 2009


Author: cotto
Date: Wed Jul 15 02:49:17 2009
New Revision: 40096
URL: https://trac.parrot.org/parrot/changeset/40096

Log:
[opsc] apply ops_format_update.patch to branch, simplifying opsc's job

Modified:
   branches/ops_pct/lib/Parrot/OpsFile.pm
   branches/ops_pct/src/ops/bit.ops
   branches/ops_pct/src/ops/cmp.ops
   branches/ops_pct/src/ops/core.ops
   branches/ops_pct/src/ops/debug.ops
   branches/ops_pct/src/ops/experimental.ops
   branches/ops_pct/src/ops/io.ops
   branches/ops_pct/src/ops/math.ops
   branches/ops_pct/src/ops/object.ops
   branches/ops_pct/src/ops/pic.ops
   branches/ops_pct/src/ops/pmc.ops
   branches/ops_pct/src/ops/set.ops
   branches/ops_pct/src/ops/string.ops
   branches/ops_pct/src/ops/sys.ops
   branches/ops_pct/src/ops/var.ops

Modified: branches/ops_pct/lib/Parrot/OpsFile.pm
==============================================================================
--- branches/ops_pct/lib/Parrot/OpsFile.pm	Wed Jul 15 02:24:37 2009	(r40095)
+++ branches/ops_pct/lib/Parrot/OpsFile.pm	Wed Jul 15 02:49:17 2009	(r40096)
@@ -239,6 +239,8 @@
 
     open my $OPS, '<', $file or die "Can't open $file, $!/$^E";
 
+    $self->version( $PConfig{VERSION} );
+
     if ( !( $file =~ s/\.ops$/.c/ ) ) {
         $file .= ".c";
     }
@@ -257,37 +259,25 @@
     my @argdirs;
     my $seen_pod;
     my $seen_op;
+    my $in_preamble;
     my $line;
     my $flags;
     my @labels;
 
     while (<$OPS>) {
-        $seen_pod = 1 if m|^=|;
+        $seen_pod    = 1 if m|^=|;
+        $in_preamble = 1 if s|^BEGIN_OPS_PREAMBLE||;
 
         unless ( $seen_op or m|^(inline\s+)?op\s+| ) {
-            if (m/^\s*VERSION\s*=\s*"(\d+\.\d+\.\d+)"\s*;\s*$/)
-            {
-                if ( exists $self->{VERSION} ) {
 
-                    #die "VERSION MULTIPLY DEFINED!";
-                }
-
-                $self->version($1);
+            if (m|^END_OPS_PREAMBLE|) {
                 $_ = '';
+                $in_preamble = 0;
             }
-            elsif (m/^\s*VERSION\s*=\s*PARROT_VERSION\s*;\s*$/) {
-                if ( exists $self->{VERSION} ) {
-
-                    #die "VERSION MULTIPLY DEFINED!";
-                }
-
-                $self->version( $PConfig{VERSION} );
-                $_ = '';
+            elsif ($in_preamble) {
+                $self->{PREAMBLE} .= $_;
             }
 
-            $self->{PREAMBLE} .= $_
-                unless $seen_pod or $count;    # Lines up to first op def.
-
             next;
         }
 

Modified: branches/ops_pct/src/ops/bit.ops
==============================================================================
--- branches/ops_pct/src/ops/bit.ops	Wed Jul 15 02:24:37 2009	(r40095)
+++ branches/ops_pct/src/ops/bit.ops	Wed Jul 15 02:49:17 2009	(r40096)
@@ -3,6 +3,7 @@
 ** bit.ops
 */
 
+BEGIN_OPS_PREAMBLE
  /* Signed shift operator that is compatible with PMC shifts.  This is
   * guaranteed to produce the same result as bitwise_left_shift_internal modulo
   * word size, ignoring the fact that Parrot integers are always signed.  This
@@ -18,7 +19,7 @@
      : (bits) > -8*INTVAL_SIZE   ? (number) >> -(bits)   \
      : 0)
 
-VERSION = PARROT_VERSION;
+END_OPS_PREAMBLE
 
 =head1 NAME
 

Modified: branches/ops_pct/src/ops/cmp.ops
==============================================================================
--- branches/ops_pct/src/ops/cmp.ops	Wed Jul 15 02:24:37 2009	(r40095)
+++ branches/ops_pct/src/ops/cmp.ops	Wed Jul 15 02:49:17 2009	(r40096)
@@ -3,8 +3,6 @@
 ** cmp.ops
 */
 
-VERSION = PARROT_VERSION;
-
 =head1 NAME
 
 cmp.ops - Comparison Opcodes

Modified: branches/ops_pct/src/ops/core.ops
==============================================================================
--- branches/ops_pct/src/ops/core.ops	Wed Jul 15 02:24:37 2009	(r40095)
+++ branches/ops_pct/src/ops/core.ops	Wed Jul 15 02:49:17 2009	(r40096)
@@ -3,13 +3,15 @@
 ** core.ops
 */
 
+BEGIN_OPS_PREAMBLE
+
 #include "parrot/dynext.h"
 #include "parrot/embed.h"
 #include "parrot/runcore_api.h"
 #include "../pmc/pmc_continuation.h"
 #include "../pmc/pmc_parrotlibrary.h"
 
-VERSION = PARROT_VERSION;
+END_OPS_PREAMBLE
 
 =head1 NAME
 

Modified: branches/ops_pct/src/ops/debug.ops
==============================================================================
--- branches/ops_pct/src/ops/debug.ops	Wed Jul 15 02:24:37 2009	(r40095)
+++ branches/ops_pct/src/ops/debug.ops	Wed Jul 15 02:49:17 2009	(r40096)
@@ -7,8 +7,6 @@
 ** debug.ops
 */
 
-VERSION = PARROT_VERSION;
-
 =head1 NAME
 
 debug.ops - Debugging Opcodes

Modified: branches/ops_pct/src/ops/experimental.ops
==============================================================================
--- branches/ops_pct/src/ops/experimental.ops	Wed Jul 15 02:24:37 2009	(r40095)
+++ branches/ops_pct/src/ops/experimental.ops	Wed Jul 15 02:49:17 2009	(r40096)
@@ -3,8 +3,6 @@
 ** experimental.ops
 */
 
-VERSION = PARROT_VERSION;
-
 =head1 NAME
 
 experimental.ops - Experimental Opcodes

Modified: branches/ops_pct/src/ops/io.ops
==============================================================================
--- branches/ops_pct/src/ops/io.ops	Wed Jul 15 02:24:37 2009	(r40095)
+++ branches/ops_pct/src/ops/io.ops	Wed Jul 15 02:49:17 2009	(r40096)
@@ -4,8 +4,9 @@
 ** io.ops
 */
 
-VERSION = PARROT_VERSION;
+BEGIN_OPS_PREAMBLE
 #include "../io/io_private.h"
+END_OPS_PREAMBLE
 
 
 =head1 NAME

Modified: branches/ops_pct/src/ops/math.ops
==============================================================================
--- branches/ops_pct/src/ops/math.ops	Wed Jul 15 02:24:37 2009	(r40095)
+++ branches/ops_pct/src/ops/math.ops	Wed Jul 15 02:49:17 2009	(r40096)
@@ -3,8 +3,6 @@
 ** math.ops
 */
 
-VERSION = PARROT_VERSION;
-
 =head1 NAME
 
 math.ops - Mathematical Opcodes

Modified: branches/ops_pct/src/ops/object.ops
==============================================================================
--- branches/ops_pct/src/ops/object.ops	Wed Jul 15 02:24:37 2009	(r40095)
+++ branches/ops_pct/src/ops/object.ops	Wed Jul 15 02:49:17 2009	(r40096)
@@ -6,9 +6,6 @@
 
 */
 
-
-VERSION = PARROT_VERSION;
-
 =head1 NAME
 
 object.ops - Class and Object Opcodes

Modified: branches/ops_pct/src/ops/pic.ops
==============================================================================
--- branches/ops_pct/src/ops/pic.ops	Wed Jul 15 02:24:37 2009	(r40095)
+++ branches/ops_pct/src/ops/pic.ops	Wed Jul 15 02:49:17 2009	(r40096)
@@ -3,12 +3,12 @@
 ** pic.ops
 */
 
+BEGIN_OPS_PREAMBLE
 #include "parrot/oplib/ops.h"
 #include "../src/pmc/pmc_fixedintegerarray.h"
 
 typedef opcode_t* (*interface_f)(Interp*, INTVAL*, void **);
-
-VERSION = PARROT_VERSION;
+END_OPS_PREAMBLE
 
 =head1 NAME
 

Modified: branches/ops_pct/src/ops/pmc.ops
==============================================================================
--- branches/ops_pct/src/ops/pmc.ops	Wed Jul 15 02:24:37 2009	(r40095)
+++ branches/ops_pct/src/ops/pmc.ops	Wed Jul 15 02:49:17 2009	(r40096)
@@ -6,8 +6,6 @@
 
 */
 
-VERSION = PARROT_VERSION;
-
 =head1 NAME
 
 pmc.ops - PMC Opcodes

Modified: branches/ops_pct/src/ops/set.ops
==============================================================================
--- branches/ops_pct/src/ops/set.ops	Wed Jul 15 02:24:37 2009	(r40095)
+++ branches/ops_pct/src/ops/set.ops	Wed Jul 15 02:49:17 2009	(r40096)
@@ -3,8 +3,6 @@
 ** set.ops
 */
 
-VERSION = PARROT_VERSION;
-
 =head1 NAME
 
 set.ops - Assignment Opcodes

Modified: branches/ops_pct/src/ops/string.ops
==============================================================================
--- branches/ops_pct/src/ops/string.ops	Wed Jul 15 02:24:37 2009	(r40095)
+++ branches/ops_pct/src/ops/string.ops	Wed Jul 15 02:49:17 2009	(r40096)
@@ -3,8 +3,6 @@
 ** string.ops
 */
 
-VERSION = PARROT_VERSION;
-
 =head1 NAME
 
 string.ops - String Opcodes

Modified: branches/ops_pct/src/ops/sys.ops
==============================================================================
--- branches/ops_pct/src/ops/sys.ops	Wed Jul 15 02:24:37 2009	(r40095)
+++ branches/ops_pct/src/ops/sys.ops	Wed Jul 15 02:49:17 2009	(r40096)
@@ -3,8 +3,6 @@
 ** sys.ops
 */
 
-VERSION = PARROT_VERSION;
-
 =head1 NAME
 
 sys.ops - System Interaction Opcodes

Modified: branches/ops_pct/src/ops/var.ops
==============================================================================
--- branches/ops_pct/src/ops/var.ops	Wed Jul 15 02:24:37 2009	(r40095)
+++ branches/ops_pct/src/ops/var.ops	Wed Jul 15 02:49:17 2009	(r40096)
@@ -3,8 +3,6 @@
 ** var.ops
 */
 
-VERSION = PARROT_VERSION;
-
 =head1 NAME
 
 var.ops - Variable Opcodes


More information about the parrot-commits mailing list