Changeset 2009 for libswish3/trunk

Timestamp:

02/03/08 23:29:35 (1 year ago)

Author:

karpet

Message:

rename some vars for clarity

Files:

• libswish3/trunk/bindings/perl/3.xs (modified) (19 diffs)
• libswish3/trunk/bindings/perl/Makefile.PL (modified) (1 diff)
• libswish3/trunk/bindings/perl/lib/SWISH/3/Xapian (deleted)
• libswish3/trunk/bindings/perl/ppport.h (modified) (21 diffs)
• libswish3/trunk/configure.ac (modified) (1 diff)
• libswish3/trunk/src/libswish3/libswish3.h (modified) (7 diffs)
• libswish3/trunk/src/libswish3/parser.c (modified) (11 diffs)

libswish3/trunk/bindings/perl/3.xs

@@ -42 +42 @@
-/* some nice XS macros from KS - thanks Marvin! */
-#define START_SET_OR_GET_SWITCH \
-SV *
+
-    /* if called as a setter, make sure the extra arg is there */ \
-    if (ix % 2 == 1) { \
@@ -178 +178 @@
-
-/* make a Perl blessed object from a C pointer */
-data
+c_ptr
-{
-    dTHX;
-    SV* obj = sv_newmortal();
-data
+c_ptr
-    return obj;
-}
@@ -212 +212 @@
-static void sp_dump_hash(SV* hash_ref) 
-{
-    
-    
-    
-    
-    
-    
-
-    
-    
-
-    hash
-    num_keys
-    
-    hash_entry
-    sv_key
-    sv_val
-    refcnt
-    
-    
-    
+
+
+
+
+
+
+
+
+
+
+hash       
+num_keys   
+
+hash_entry 
+sv_key     
+sv_val     
+refcnt     
+
+
+
-}
-
@@ -237 +237 @@
-{
-    dTHX;
+    char * str;
+    
-    warn("describing object\n");
-char * 
+
-    if (SvROK(object))
-    {
@@ -273 +275 @@
-static char * sp_which_class( char * c )
-{
-
+
+
+
-    if (SubClasses == (HV*)NULL)
-        sp_make_subclasses(DEFAULT_BASE_CLASS);
-
-SV** 
+
+
-    if ( !sv )
-        croak("could not fetch %s class from SubClasses", c);
@@ -303 +307 @@
-{
-    dTHX;
-
+
+
+
+
+
-}
-
@@ -321 +329 @@
-{
-    dTHX;
-key, strlen(
+(char*)key, strlen((char*)
-}
-
@@ -345 +353 @@
-    
-    /* analogous to @strings = split(/SWISH_META_CONNECTOR/, str) */
-
+(xmlChar*)
-    {
-        len = tmp - str;
-        if(len)
-
+(char*)
-            
-        str = tmp + bump;  /* move the pointer up */
@@ -356 +364 @@
-    /* if there was only one string, make sure it's in array */
-    if (xmlBufferLength(buf) && av_len(strings) == -1)
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -379 +395 @@
-    swish_debug_docinfo( parse_data->docinfo );
-    swish_debug_wordlist( parse_data->wordlist );
-
-
+(xmlChar*)
+(xmlChar*)
-    warn("\n");
-}
@@ -414 +430 @@
-    dTHX;
-    unsigned int wpos, offset, num_code_points;
+    MAGIC      *mg;
+    REGEXP     *rx;
+    SV         *wrapper;
+    xmlChar    *str_start;
+    int         str_len;
+    xmlChar    *str_end;
-    xmlChar *meta, *ctxt;
-    SV *token_re;
@@ -426 +448 @@
-    va_end(args);
-    
-
-
-
-
-
-
-
+
+
+
+
+
+
-    token_re        = analyzer->regex;
-    token_handler   = analyzer->stash;
@@ -453 +474 @@
-    
-    /* wrap the string in an SV to please the regex engine */
-
+(char*)
-    SvCUR_set(wrapper, str_len);
-    SvPOK_on(wrapper);
@@ -460 +481 @@
-    num_code_points = 0;
-    
-str, str_end, 
+(char*)str, (char*)str_end, (char*)
-    {
-        xmlChar * start_ptr = str + rx->startp[0];
@@ -796 +817 @@
-    swish_Analyzer * ana;
-    char * skey;
+    SV *RETVAL;
-PPCODE:
-{
@@ -1352 +1374 @@
-    PREINIT:
-        char * CLASS;
-
-
+(xmlChar*)
+(xmlChar*)
-        unsigned int word_pos    = 0;
-        unsigned int offset      = 0;
-
+(xmlChar*)
-        
-    CODE:
@@ -1377 +1399 @@
-                
-            if ( items > 4 )
-
+(xmlChar*)
-                
-            if ( items > 5 )
-
+(xmlChar*)
-                
-        }
@@ -1412 +1434 @@
-    PREINIT:
-        char * CLASS;
-
-
+(xmlChar*)
+(xmlChar*)
-        unsigned int word_pos    = 0;
-        unsigned int offset      = 0;
-
+(xmlChar*)
-        
-    CODE:
@@ -1437 +1459 @@
-                
-            if ( items > 4 )
-
+(xmlChar*)
-                
-            if ( items > 5 )
-
+(xmlChar*)
-                
-        }

libswish3/trunk/bindings/perl/Makefile.PL

@@ -9 +9 @@
-      (ABSTRACT_FROM  => 'lib/SWISH/3.pm',
-       AUTHOR         => 'Peter Karman <perl@peknet.com>') : ()),
-opt/local
+usr
-    DEFINE            => '', # e.g., '-DHAVE_SOMETHING'
-opt/local
+usr/include -I/usr/local/include -I/usr
-        # Un-comment this if you add C files to link with later:
-    # OBJECT            => '$(O_FILES)', # link all the C files too

libswish3/trunk/bindings/perl/ppport.h

@@ -5 +5 @@
-----------------------------------------------------------------------
-
-3
+6
-   
-    Automatically created by Devel::PPPort running under
-8006 on Tue Jul 11 09:34:09 2006
+9003 on Fri May 20 22:14:30 2005
-    
-    Do NOT edit this file directly! -- Edit PPPort_pm.PL and the
@@ -23 +23 @@
-=head1 NAME
-
-3
+6
-
-=head1 SYNOPSIS
@@ -45 +45 @@
-  --list-provided             list provided API
-  --list-unsupported          list unsupported API
+  --api-info=name             show Perl API portability information
-
-=head1 COMPATIBILITY
@@ -124 +125 @@
-F<ppport.h> and below which version of Perl they probably
-won't be available or work.
+
+=head2 --api-info=I<name>
+
+Show portability information for API elements matching I<name>.
+If I<name> is surrounded by slashes, it is interpreted as a regular
+expression.
-
-=head1 DESCRIPTION
@@ -239 +246 @@
-This would output context diffs with 10 lines of context.
-
+To display portability information for the C<newSVpvn> function,
+use:
+
+    perl ppport.h --api-info=newSVpvn
+
+Since the argument to C<--api-info> can be a regular expression,
+you can use
+
+    perl ppport.h --api-info=/_nomg$/
+
+to display portability information for all C<_nomg> functions or
+
+    perl ppport.h --api-info=/./
+
+to display information for all known API elements.
+
-=head1 BUGS
-
@@ -281 +304 @@
-=head1 COPYRIGHT
-
-
+-2005
-
-Version 2.x, Copyright (C) 2001, Paul Marquess.
@@ -315 +338 @@
-    help quiet diag! hints! changes! cplusplus
-    patch=s copy=s diff=s compat-version=s
-
+ api-info=s
-  )) or usage();
-};
@@ -750 +773 @@
-UVuf|5.006000||p
-UVxf|5.006000||p
+XCPT_CATCH|5.009002||p
+XCPT_RETHROW|5.009002||p
+XCPT_TRY_END|5.009002||p
+XCPT_TRY_START|5.009002||p
-XPUSHi|||
-XPUSHmortal|5.009002||p
@@ -880 +907 @@
-dTHX|5.006000||p
-dUNDERBAR|5.009002||p
+dXCPT|5.009002||p
-dXSARGS|||
-dXSI32|||
+dXSTARG|5.006000||p
-deb_curcv|||
-deb_nocontext|||vn
@@ -892 +921 @@
-debstack||5.007003|
-deb||5.007003|v
-default_protect|||v
-del_he|||
-del_sv|||
@@ -1071 +1099 @@
-gv_fetchmethod|||
-gv_fetchmeth|||
+gv_fetchpvn_flags||5.009002|
-gv_fetchpv|||
+gv_fetchsv||5.009002|
-gv_fullname3||5.004000|
-gv_fullname4||5.006001|
@@ -1147 +1177 @@
-isUPPER|||
-is_an_int|||
+is_gv_magical_sv|||
-is_gv_magical|||
-is_handle_constructor|||
@@ -1469 +1500 @@
-op_free|||
-op_null||5.007002|
+op_refcnt_lock||5.009002|
+op_refcnt_unlock||5.009002|
-open_script|||
-pMY_CXT_|5.007003||p
@@ -1646 +1679 @@
-savestack_grow_cnt||5.008001|
-savestack_grow|||
+savesvpv||5.009002|
-sawparens|||
-scalar_mod_type|||
@@ -1911 +1945 @@
-uvuni_to_utf8||5.007001|
-validate_suid|||
-vcall_body|||
-vcall_list_body|||
-vcmp||5.009000|
-vcroak||5.006000|
-vdeb||5.007003|
-vdefault_protect|||
-vdie|||
-vdocatch_body|||
-vform||5.006000|
-visit|||
@@ -1928 +1958 @@
-vnormal||5.009002|
-vnumify||5.009000|
-vparse_body|||
-vrun_body|||
-vstringify||5.009000|
-vwarner||5.006000|
@@ -1984 +2012 @@
-
-  $need{$1} = 1 if m{^#if\s+defined\(NEED_(\w+)(?:_GLOBAL)?\)};
+}
+
+if (exists $opt{'api-info'}) {
+  my $f;
+  my $count = 0;
+  my $match = $opt{'api-info'} =~ m!^/(.*)/$! ? $1 : "^\Q$opt{'api-info'}\E\$";
+  for $f (sort { lc $a cmp lc $b } keys %API) {
+    next unless $f =~ /$match/;
+    print "\n=== $f ===\n\n";
+    my $info = 0;
+    if ($API{$f}{base} || $API{$f}{todo}) {
+      my $base = format_version($API{$f}{base} || $API{$f}{todo});
+      print "Supported at least starting from perl-$base.\n";
+      $info++;
+    }
+    if ($API{$f}{provided}) {
+      my $todo = $API{$f}{todo} ? format_version($API{$f}{todo}) : "5.003";
+      print "Support by $ppport provided back to perl-$todo.\n";
+      print "Support needs to be explicitly requested by NEED_$f.\n" if exists $need{$f};
+      print "Depends on: ", join(', ', @{$depends{$f}}), ".\n" if exists $depends{$f};
+      print "$hints{$f}" if exists $hints{$f};
+      $info++;
+    }
+    unless ($info) {
+      print "No portability information available.\n";
+    }
+    $count++;
+  }
+  if ($count > 0) {
+    print "\n";
+  }
+  else {
+    print "Found no API matching '$opt{'api-info'}'.\n";
+  }
+  exit 0;
-}
-
@@ -2970 +3033 @@
-#endif
-
-
-
+
+
+
+
+
+
+
+
-#    define PERL_UNUSED_DECL
-#  else
-#    define PERL_UNUSED_DECL __attribute__((unused))
-#  endif
-#else
-#  define PERL_UNUSED_DECL
-#endif
-#ifndef NOOP
@@ -3165 +3230 @@
-#ifndef dITEMS
-#  define dITEMS                         I32 items = SP - MARK
+#endif
+#ifndef dXSTARG
+#  define dXSTARG                        SV * targ = sv_newmortal()
-#endif
-#ifndef dTHR
@@ -3620 +3688 @@
-#endif
-
-
+_force
- * Always use the SvPV_force() macro instead of sv_pvn_force().
- */
@@ -4808 +4876 @@
-#endif
-
+#ifdef NO_XSLOCKS
+#  ifdef dJMPENV
+#    define dXCPT             dJMPENV; int rEtV = 0
+#    define XCPT_TRY_START    JMPENV_PUSH(rEtV); if (rEtV == 0)
+#    define XCPT_TRY_END      JMPENV_POP;
+#    define XCPT_CATCH        if (rEtV != 0)
+#    define XCPT_RETHROW      JMPENV_JUMP(rEtV)
+#  else
+#    define dXCPT             Sigjmp_buf oldTOP; int rEtV = 0
+#    define XCPT_TRY_START    Copy(top_env, oldTOP, 1, Sigjmp_buf); rEtV = Sigsetjmp(top_env, 1); if (rEtV == 0)
+#    define XCPT_TRY_END      Copy(oldTOP, top_env, 1, Sigjmp_buf);
+#    define XCPT_CATCH        if (rEtV != 0)
+#    define XCPT_RETHROW      Siglongjmp(top_env, rEtV)
+#  endif
+#endif
+
-#endif /* _P_P_PORTABILITY_H_ */
-

libswish3/trunk/configure.ac

@@ -42 +42 @@
-        AC_MSG_RESULT(found version $XML2_VERSION)
-    else
-SwishParser
+libswish3
-    fi
-

libswish3/trunk/src/libswish3/libswish3.h

@@ -50 +50 @@
-
-/* default config hash key names */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-   
-
-
-
-
-
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+
+       
+       
+       
+       
+       
-
-/* tags */
@@ -154 +154 @@
-typedef struct swish_MetaStackElement  *swish_MetaStackElementPtr;
-typedef struct swish_MetaStack          swish_MetaStack;
+typedef struct swish_MetaName           swish_MetaName;
+typedef struct swish_Property           swish_Property;
-typedef struct swish_Word               swish_Word;
-typedef struct swish_WordList           swish_WordList;
@@ -176 +178 @@
-struct swish_Config
-{
-scripting language
-scripting language
+binding
+binding
-    xmlHashTablePtr              conf;       /* the meat */
-    struct swish_ConfigFlags    *flags;      /* shortcuts for parsing */
@@ -200 +202 @@
-struct swish_NamedBuffer
-{
-scripting language
-scripting language
+binding
+binding
-    xmlHashTablePtr hash;       /* the meat */
-};
@@ -218 +220 @@
-};
-
+struct swish_MetaName
+{
+    unsigned int        id;
+    xmlChar            *name;
+    int                 bias;
+};
+
+struct swish_Property
+{
+    unsigned int        id;
+    xmlChar            *name;
+};
-
-struct swish_Word
-{
- 
- 
- 
- 
- 
- 
+
+
+
+
+
+
-    struct swish_Word  *next;          // pointer to next swish_Word
-    struct swish_Word  *prev;          // pointer to prev swish_Word
@@ -233 +247 @@
-struct swish_WordList
-{
-
-
-
-
-ref_cnt;        // for scripting language
+     
+     
+     
+     
+     ref_cnt;        // for binding
-};
-
@@ -281 +295 @@
-struct swish_ParseData
-{
-buf_ptr;            // tmp text (MetaName)
+meta_buf;           // tmp MetaName
-    xmlBufferPtr           prop_buf;           // tmp Property buffer
-    xmlChar               *tag;                // current tag name

libswish3/trunk/src/libswish3/parser.c

@@ -316 +316 @@
-    if (SWISH_DEBUG == SWISH_DEBUG_PARSER)
-        SWISH_DEBUG_MSG("buffer is >>%s<< before flush, word_pos = %d", 
-buf_ptr
+meta_buf
-
-    /* since we only flush the buffer when metaname changes, and
@@ -325 +325 @@
-        parse_data->word_pos++;
-        
-buf_ptr
+meta_buf
-       this gives us both tokens and raw text de-tagged but organized by metaname.
-    */
-    swish_add_buf_to_nb( parse_data->metanames,
-                         metaname,
-
+
+
+
+
-                         
-    if (parse_data->context_as_meta)
@@ -341 +344 @@
-            swish_add_buf_to_nb(parse_data->metanames,
-                                s->temp->name, 
-
+
+
+
+
-        }
-    }                    
@@ -349 +355 @@
-
-        tokenize(   parse_data, 
-buf_ptr
-buf_ptr
+meta_buf
+meta_buf
-                    metaname,
-                    context
@@ -356 +362 @@
-    }
-
-buf_ptr
+meta_buf
-
-}
@@ -517 +523 @@
-    int             i;
-    xmlChar         output[len];
-buf_ptr
+meta_buf
-    /*
-     * why not wchar_t ? len is number of bytes, not number of
@@ -740 +746 @@
-    ptr->stash = stash;
-    
-buf_ptr 
+meta_buf
-    ptr->prop_buf = xmlBufferCreateSize(SWISH_BUFFER_CHUNK_SIZE);
-    
@@ -849 +855 @@
-        SWISH_DEBUG_MSG("freeing swish_ParseData xmlBuffer");
-
-buf_ptr
+meta_buf
-
-
@@ -1271 +1277 @@
-                swish_debug_docinfo(parse_data->docinfo);
-                SWISH_DEBUG_MSG("  word buffer length: %d bytes", 
-buf_ptr
+meta_buf
-                SWISH_DEBUG_MSG(" (%d words)", parse_data->docinfo->nwords);
-            }
@@ -1402 +1408 @@
-        swish_debug_docinfo(parse_data->docinfo);
-        SWISH_DEBUG_MSG("  word buffer length: %d bytes", 
-buf_ptr
+meta_buf
-        SWISH_DEBUG_MSG(" (%d words)", parse_data->docinfo->nwords);
-    }
@@ -1454 +1460 @@
-        swish_debug_docinfo(parse_data->docinfo);
-        SWISH_DEBUG_MSG("  word buffer length: %d bytes", 
-buf_ptr
+meta_buf
-        SWISH_DEBUG_MSG(" (%d words)", parse_data->docinfo->nwords);
-    }