[svn:parrot] r44057 - in branches/rm_cflags: lib/Parrot/Configure t/steps/gen

[coke at svn.parrot.org]

Author: coke
Date: Wed Feb 17 02:19:58 2010
New Revision: 44057
URL: https://trac.parrot.org/parrot/changeset/44057

Log:
Remove old, internal (and internally deprecated) makefile syntax.

Modified:
   branches/rm_cflags/lib/Parrot/Configure/Compiler.pm
   branches/rm_cflags/t/steps/gen/makefiles-01.t

Modified: branches/rm_cflags/lib/Parrot/Configure/Compiler.pm
==============================================================================
--- branches/rm_cflags/lib/Parrot/Configure/Compiler.pm	Wed Feb 17 01:33:13 2010	(r44056)
+++ branches/rm_cflags/lib/Parrot/Configure/Compiler.pm	Wed Feb 17 02:19:58 2010	(r44057)
@@ -275,11 +275,6 @@
 
 will be used on "win32" and if "glut" is defined, but not on "cygwin".
 
-B<Legacy Syntax:>
-
-The old syntax #CONDITIONED_LINE(var): and
-#INVERSE_CONDITIONED_LINE(var): is still supported, but is deprecated.
-
 =item comment_type
 
 This option takes has two possible values, C<#> or C</*>. If present and
@@ -459,16 +454,6 @@
                 next LINE if $former_truth;
                 $line = $1;
             }
-            # Legacy, DEPRECATED.
-            elsif (($expr,$rest)=($line =~ m/^#CONDITIONED_LINE\(([^)]+)\):(.*)/s)) {
-                next LINE unless cond_eval($conf, $expr);
-                $line = $rest;
-            }
-            elsif (($expr,$rest)=($line =~ m/^#INVERSE_CONDITIONED_LINE\(([^)]+)\):(.*)/s )) {
-                next LINE if cond_eval($conf, $expr);
-                $line = $rest;
-            }
-
             else { # reset
                 $former_truth = -1; # ELSE must immediately follow a conditional.
             }

Modified: branches/rm_cflags/t/steps/gen/makefiles-01.t
==============================================================================
--- branches/rm_cflags/t/steps/gen/makefiles-01.t	Wed Feb 17 01:33:13 2010	(r44056)
+++ branches/rm_cflags/t/steps/gen/makefiles-01.t	Wed Feb 17 02:19:58 2010	(r44057)
@@ -68,12 +68,6 @@
        #["IF(value == xx)",                 0], # invalid op error
        #["IF(value = xx)",                  0], # invalid op error
        ["IF(value=xx)",                     0], # also invalid, no warning. checks for key value=xx
-
-       # Legacy syntax                 true or false
-       ["CONDITIONED_LINE(true)",           1],
-       ["INVERSE_CONDITIONED_LINE(true)",   0],
-       ["CONDITIONED_LINE(false)",          0],
-       ["INVERSE_CONDITIONED_LINE(false)",  1],
       );
 }