lucene-pylucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From va...@apache.org
Subject svn commit: r1766805 - in /lucene/pylucene/trunk: CHANGES Makefile jcc/CHANGES jcc/jcc/cpp.py
Date Thu, 27 Oct 2016 10:43:20 GMT
Author: vajda
Date: Thu Oct 27 10:43:20 2016
New Revision: 1766805

URL: http://svn.apache.org/viewvc?rev=1766805&view=rev
Log:
 - extended ability to explicitely requesting wrappers to fields
 - added explicit wrapper for org.apache.lucene.analysis.Tokenizer:input


Modified:
    lucene/pylucene/trunk/CHANGES
    lucene/pylucene/trunk/Makefile
    lucene/pylucene/trunk/jcc/CHANGES
    lucene/pylucene/trunk/jcc/jcc/cpp.py

Modified: lucene/pylucene/trunk/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/CHANGES?rev=1766805&r1=1766804&r2=1766805&view=diff
==============================================================================
--- lucene/pylucene/trunk/CHANGES (original)
+++ lucene/pylucene/trunk/CHANGES Thu Oct 27 10:43:20 2016
@@ -1,3 +1,8 @@
+Version 6.2.0 ->
+----------------------
+ - added explicit wrapper for org.apache.lucene.analysis.Tokenizer:input
+ - 
+
 Version 4.10.1 -> 6.2.0
 -----------------------
  - using Lucene 6.2.0 sources

Modified: lucene/pylucene/trunk/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/Makefile?rev=1766805&r1=1766804&r2=1766805&view=diff
==============================================================================
--- lucene/pylucene/trunk/Makefile (original)
+++ lucene/pylucene/trunk/Makefile Thu Oct 27 10:43:20 2016
@@ -315,6 +315,7 @@ GENERATE=$(JCC) $(foreach jar,$(JARS),--
            --mapping java.util.Properties 'getProperty:(Ljava/lang/String;)Ljava/lang/String;'
\
            --sequence java.util.AbstractList 'size:()I' 'get:(I)Ljava/lang/Object;' \
            org.apache.lucene.index.IndexWriter:getReader \
+           org.apache.lucene.analysis.Tokenizer:input \
            --version $(LUCENE_VER) \
            --module python/collections.py \
            --module python/ICUNormalizer2Filter.py \

Modified: lucene/pylucene/trunk/jcc/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/CHANGES?rev=1766805&r1=1766804&r2=1766805&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/CHANGES (original)
+++ lucene/pylucene/trunk/jcc/CHANGES Thu Oct 27 10:43:20 2016
@@ -1,3 +1,8 @@
+Version 2.22 -> 2.23
+--------------------
+ - extended ability to explicitely requesting wrappers to fields
+ -
+ 
 Version 2.21 -> 2.22
 --------------------
  - monkeypatched customize_compiler to fix darwin linker error due to -Wl,-x

Modified: lucene/pylucene/trunk/jcc/jcc/cpp.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/cpp.py?rev=1766805&r1=1766804&r2=1766805&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/cpp.py (original)
+++ lucene/pylucene/trunk/jcc/jcc/cpp.py Thu Oct 27 10:43:20 2016
@@ -380,7 +380,7 @@ def jcc(args):
 
     classNames = set()
     listedClassNames = set()
-    listedMethodNames = {}
+    listedMethodOrFieldNames = {}
     packages = set()
     jars = []
     classpath = [_jcc.CLASSPATH]
@@ -544,7 +544,7 @@ def jcc(args):
         else:
             if ':' in arg:
                 arg, method = arg.split(':', 1)
-                listedMethodNames.setdefault(arg, set()).add(method)
+                listedMethodOrFieldNames.setdefault(arg, set()).add(method)
             classNames.add(arg)
             listedClassNames.add(arg)
         i += 1
@@ -675,7 +675,8 @@ def jcc(args):
                 (superCls, constructors, methods, protectedMethods,
                  methodNames, fields, instanceFields, declares) = \
                     header(env, out_h, cls, typeset, packages, excludes,
-                           generics, listedMethodNames.get(cls.getName(), ()),
+                           generics,
+                           listedMethodOrFieldNames.get(cls.getName(), ()),
                            _dll_export)
 
                 if not allInOne:
@@ -683,7 +684,7 @@ def jcc(args):
                 names, superNames = code(env, out_cpp,
                                          cls, superCls, constructors,
                                          methods, protectedMethods,
-                                         methodNames, fields, instanceFields, 
+                                         methodNames, fields, instanceFields,
                                          declares, typeset)
                 if moduleName:
                     name = renames.get(className) or names[-1]
@@ -736,7 +737,7 @@ def jcc(args):
 
 
 def header(env, out, cls, typeset, packages, excludes, generics,
-           listedMethodNames, _dll_export):
+           listedMethodOrFieldNames, _dll_export):
 
     names = cls.getName().split('.')
     superCls = cls.getSuperclass()
@@ -822,7 +823,7 @@ def header(env, out, cls, typeset, packa
             continue
         modifiers = method.getModifiers()
         if (Modifier.isPublic(modifiers) or
-            method.getName() in listedMethodNames):
+            method.getName() in listedMethodOrFieldNames):
             if generics:
                 returnType = method.getGenericReturnType()
             else:
@@ -878,7 +879,8 @@ def header(env, out, cls, typeset, packa
     instanceFields = []
     for field in cls.getDeclaredFields():
         modifiers = field.getModifiers()
-        if Modifier.isPublic(modifiers):
+        if (Modifier.isPublic(modifiers) or
+            field.getName() in listedMethodOrFieldNames):
             if generics:
                 fieldType = field.getGenericType()
             else:



Mime
View raw message