[6062] parsetexi remove XS constant loading code

[Gavin D. Smith]

Revision: 6062
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6062
Author:   gavin
Date:     2015-01-23 18:04:06 +0000 (Fri, 23 Jan 2015)
Log Message:
-----------
parsetexi remove XS constant loading code

Modified Paths:
--------------
    trunk/parsetexi/ChangeLog
    trunk/parsetexi/Parsetexi/Parsetexi.xs
    trunk/parsetexi/Parsetexi/lib/Parsetexi.pm

Removed Paths:
-------------
    trunk/parsetexi/Parsetexi/const-c.inc
    trunk/parsetexi/Parsetexi/const-xs.inc

Modified: trunk/parsetexi/ChangeLog
===================================================================
--- trunk/parsetexi/ChangeLog   2015-01-23 17:51:50 UTC (rev 6061)
+++ trunk/parsetexi/ChangeLog   2015-01-23 18:04:06 UTC (rev 6062)
@@ -4,6 +4,9 @@
        * end_line.c (end_line): Check return value of lookup_command 
        correctly.
 
+       * Parsetexi/Parsetexi.xs, Parsetexi/lib/Parsetexi.pm: Remove 
+       constant loading code.
+
 2015-01-23  Gavin Smith  <address@hidden>
 
        * tree_types.h (enum extra_type): Add extra_string value.

Modified: trunk/parsetexi/Parsetexi/Parsetexi.xs
===================================================================
--- trunk/parsetexi/Parsetexi/Parsetexi.xs      2015-01-23 17:51:50 UTC (rev 
6061)
+++ trunk/parsetexi/Parsetexi/Parsetexi.xs      2015-01-23 18:04:06 UTC (rev 
6062)
@@ -9,12 +9,8 @@
 #include "../tree.h"
 #include "../api.h"
 
-#include "const-c.inc"
-
 MODULE = Parsetexi             PACKAGE = Parsetexi             
 
-INCLUDE: const-xs.inc
-
 TYPEMAP: <<END
 ELEMENT *   T_UV
 END

Deleted: trunk/parsetexi/Parsetexi/const-c.inc
===================================================================
--- trunk/parsetexi/Parsetexi/const-c.inc       2015-01-23 17:51:50 UTC (rev 
6061)
+++ trunk/parsetexi/Parsetexi/const-c.inc       2015-01-23 18:04:06 UTC (rev 
6062)
@@ -1,55 +0,0 @@
-#define PERL_constant_NOTFOUND 1
-#define PERL_constant_NOTDEF   2
-#define PERL_constant_ISIV     3
-#define PERL_constant_ISNO     4
-#define PERL_constant_ISNV     5
-#define PERL_constant_ISPV     6
-#define PERL_constant_ISPVN    7
-#define PERL_constant_ISSV     8
-#define PERL_constant_ISUNDEF  9
-#define PERL_constant_ISUV     10
-#define PERL_constant_ISYES    11
-
-#ifndef NVTYPE
-typedef double NV; /* 5.6 and later define NVTYPE, and typedef NV to it.  */
-#endif
-#ifndef aTHX_
-#define aTHX_ /* 5.6 or later define this for threading support.  */
-#endif
-#ifndef pTHX_
-#define pTHX_ /* 5.6 or later define this for threading support.  */
-#endif
-
-static int
-constant (pTHX_ const char *name, STRLEN len) {
-  /* Initially switch on the length of the name.  */
-  /* When generated this function returned values for the list of names given
-     in this section of perl code.  Rather than manually editing these 
functions
-     to add or remove constants, which would result in this comment and section
-     of code becoming inaccurate, we recommend that you edit this section of
-     code, and use it to regenerate a new set of constant functions which you
-     then use to replace the originals.
-
-     Regenerate these constant functions by feeding this entire source file to
-     perl -x
-
-#!/usr/bin/perl5.18.1 -w
-use ExtUtils::Constant qw (constant_types C_constant XS_constant);
-
-my $types = {map {($_, 1)} qw()};
-my @names = (qw());
-
-print constant_types(), "\n"; # macro defs
-foreach (C_constant ("Parsetexi", 'constant', 'IV', $types, undef, 3, @names) 
) {
-    print $_, "\n"; # C constant subs
-}
-print "\n#### XS Section:\n";
-print XS_constant ("Parsetexi", $types);
-__END__
-   */
-
-  switch (len) {
-  }
-  return PERL_constant_NOTFOUND;
-}
-

Deleted: trunk/parsetexi/Parsetexi/const-xs.inc
===================================================================
--- trunk/parsetexi/Parsetexi/const-xs.inc      2015-01-23 17:51:50 UTC (rev 
6061)
+++ trunk/parsetexi/Parsetexi/const-xs.inc      2015-01-23 18:04:06 UTC (rev 
6062)
@@ -1,89 +0,0 @@
-void
-constant(sv)
-    PREINIT:
-#ifdef dXSTARG
-       dXSTARG; /* Faster if we have it.  */
-#else
-       dTARGET;
-#endif
-       STRLEN          len;
-        int            type;
-       /* IV           iv;     Uncomment this if you need to return IVs */
-       /* NV           nv;     Uncomment this if you need to return NVs */
-       /* const char   *pv;    Uncomment this if you need to return PVs */
-    INPUT:
-       SV *            sv;
-        const char *   s = SvPV(sv, len);
-    PPCODE:
-       type = constant(aTHX_ s, len);
-      /* Return 1 or 2 items. First is error message, or undef if no error.
-           Second, if present, is found value */
-        switch (type) {
-        case PERL_constant_NOTFOUND:
-          sv =
-           sv_2mortal(newSVpvf("%s is not a valid Parsetexi macro", s));
-          PUSHs(sv);
-          break;
-        case PERL_constant_NOTDEF:
-          sv = sv_2mortal(newSVpvf(
-           "Your vendor has not defined Parsetexi macro %s, used",
-                                  s));
-          PUSHs(sv);
-          break;
-       /* Uncomment this if you need to return IVs
-        case PERL_constant_ISIV:
-          EXTEND(SP, 1);
-          PUSHs(&PL_sv_undef);
-          PUSHi(iv);
-          break; */
-       /* Uncomment this if you need to return NOs
-        case PERL_constant_ISNO:
-          EXTEND(SP, 1);
-          PUSHs(&PL_sv_undef);
-          PUSHs(&PL_sv_no);
-          break; */
-       /* Uncomment this if you need to return NVs
-        case PERL_constant_ISNV:
-          EXTEND(SP, 1);
-          PUSHs(&PL_sv_undef);
-          PUSHn(nv);
-          break; */
-       /* Uncomment this if you need to return PVs
-        case PERL_constant_ISPV:
-          EXTEND(SP, 1);
-          PUSHs(&PL_sv_undef);
-          PUSHp(pv, strlen(pv));
-          break; */
-       /* Uncomment this if you need to return PVNs
-        case PERL_constant_ISPVN:
-          EXTEND(SP, 1);
-          PUSHs(&PL_sv_undef);
-          PUSHp(pv, iv);
-          break; */
-       /* Uncomment this if you need to return SVs
-        case PERL_constant_ISSV:
-          EXTEND(SP, 1);
-          PUSHs(&PL_sv_undef);
-          PUSHs(sv);
-          break; */
-       /* Uncomment this if you need to return UNDEFs
-        case PERL_constant_ISUNDEF:
-          break; */
-       /* Uncomment this if you need to return UVs
-        case PERL_constant_ISUV:
-          EXTEND(SP, 1);
-          PUSHs(&PL_sv_undef);
-          PUSHu((UV)iv);
-          break; */
-       /* Uncomment this if you need to return YESs
-        case PERL_constant_ISYES:
-          EXTEND(SP, 1);
-          PUSHs(&PL_sv_undef);
-          PUSHs(&PL_sv_yes);
-          break; */
-        default:
-          sv = sv_2mortal(newSVpvf(
-           "Unexpected return type %d while processing Parsetexi macro %s, 
used",
-               type, s));
-          PUSHs(sv);
-        }

Modified: trunk/parsetexi/Parsetexi/lib/Parsetexi.pm
===================================================================
--- trunk/parsetexi/Parsetexi/lib/Parsetexi.pm  2015-01-23 17:51:50 UTC (rev 
6061)
+++ trunk/parsetexi/Parsetexi/lib/Parsetexi.pm  2015-01-23 18:04:06 UTC (rev 
6062)
@@ -38,29 +38,6 @@
 
 our $VERSION = '0.01';
 
-sub AUTOLOAD {
-    # This AUTOLOAD is used to 'autoload' constants from the constant()
-    # XS function.
-
-    my $constname;
-    our $AUTOLOAD;
-    ($constname = $AUTOLOAD) =~ s/.*:://;
-    croak "&Parsetexi::constant not defined" if $constname eq 'constant';
-    my ($error, $val) = constant($constname);
-    if ($error) { croak $error; }
-    {
-       no strict 'refs';
-       # Fixed between 5.005_53 and 5.005_61
-#XXX   if ($] >= 5.00561) {
-#XXX       *$AUTOLOAD = sub () { $val };
-#XXX   }
-#XXX   else {
-           *$AUTOLOAD = sub { $val };
-#XXX   }
-    }
-    goto &$AUTOLOAD;
-}
-
 require XSLoader;
 XSLoader::load('Parsetexi', $VERSION);