You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/08/23 20:03:08 UTC
svn commit: r1376617 -
/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/
Author: uschindler
Date: Thu Aug 23 18:03:06 2012
New Revision: 1376617
URL: http://svn.apache.org/viewvc?rev=1376617&view=rev
Log:
Fix strange logic with UOE and abstract methods, as hierarchy is otherwise hard to understand. TODO: indent is sometimes 4
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked33.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked34.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked35.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked36.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked37.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked38.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked39.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked40.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked41.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked42.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked43.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked44.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked45.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked46.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked47.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked48.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked49.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked50.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked51.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked52.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked53.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked54.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked55.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked56.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked57.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked58.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked59.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked60.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked61.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked62.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked63.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked64.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java Thu Aug 23 18:03:06 2012
@@ -152,16 +152,6 @@ abstract class BulkOperation implements
}
@Override
- public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
- throw new UnsupportedOperationException();
- }
-
- @Override
public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
encode(toLongArray(values, valuesOffset, iterations * valueCount()), 0, blocks, blocksOffset, iterations);
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked33.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked33.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked33.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked33.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked33 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked34.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked34.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked34.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked34.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked34 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked35.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked35.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked35.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked35.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked35 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked36.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked36.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked36.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked36.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked36 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked37.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked37.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked37.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked37.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked37 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked38.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked38.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked38.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked38.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked38 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked39.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked39.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked39.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked39.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked39 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked40.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked40.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked40.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked40.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked40 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked41.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked41.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked41.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked41.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked41 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked42.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked42.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked42.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked42.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked42 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked43.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked43.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked43.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked43.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked43 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked44.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked44.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked44.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked44.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked44 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked45.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked45.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked45.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked45.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked45 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked46.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked46.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked46.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked46.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked46 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked47.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked47.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked47.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked47.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked47 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked48.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked48.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked48.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked48.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked48 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked49.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked49.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked49.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked49.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked49 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked50.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked50.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked50.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked50.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked50 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked51.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked51.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked51.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked51.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked51 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked52.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked52.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked52.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked52.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked52 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked53.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked53.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked53.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked53.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked53 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked54.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked54.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked54.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked54.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked54 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked55.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked55.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked55.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked55.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked55 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked56.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked56.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked56.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked56.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked56 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked57.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked57.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked57.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked57.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked57 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked58.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked58.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked58.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked58.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked58 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked59.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked59.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked59.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked59.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked59 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked60.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked60.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked60.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked60.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked60 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked61.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked61.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked61.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked61.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked61 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked62.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked62.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked62.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked62.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked62 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked63.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked63.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked63.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked63.java Thu Aug 23 18:03:06 2012
@@ -35,6 +35,10 @@ final class BulkOperationPacked63 extend
throw new UnsupportedOperationException();
}
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(long[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
assert blocksOffset + iterations * blockCount() <= blocks.length;
assert valuesOffset + iterations * valueCount() <= values.length;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked64.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked64.java?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked64.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked64.java Thu Aug 23 18:03:06 2012
@@ -38,6 +38,16 @@ final class BulkOperationPacked64 extend
System.arraycopy(blocks, blocksOffset, values, valuesOffset, valueCount() * iterations);
}
+ @Override
+ public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
LongBuffer.wrap(values, valuesOffset, iterations * valueCount()).put(ByteBuffer.wrap(blocks, blocksOffset, 8 * iterations * blockCount()).asLongBuffer());
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py?rev=1376617&r1=1376616&r2=1376617&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py Thu Aug 23 18:03:06 2012
@@ -55,16 +55,6 @@ FOOTER="""
}
@Override
- public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
- throw new UnsupportedOperationException();
- }
-
- @Override
public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
encode(toLongArray(values, valuesOffset, iterations * valueCount()), 0, blocks, blocksOffset, iterations);
}
@@ -277,6 +267,16 @@ def packed64(bpv, f):
System.arraycopy(blocks, blocksOffset, values, valuesOffset, valueCount() * iterations);
}
+ @Override
+ public void decode(long[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void decode(byte[] blocks, int blocksOffset, int[] values, int valuesOffset, int iterations) {
+ throw new UnsupportedOperationException();
+ }
+
public void decode(byte[] blocks, int blocksOffset, long[] values, int valuesOffset, int iterations) {
LongBuffer.wrap(values, valuesOffset, iterations * valueCount()).put(ByteBuffer.wrap(blocks, blocksOffset, 8 * iterations * blockCount()).asLongBuffer());
}
@@ -298,79 +298,77 @@ def p64_decode(bpv, f, bits, values):
f.write(" public void decode(long[] blocks, int blocksOffset, %s[] values, int valuesOffset, int iterations) {\n" %typ)
if bits < bpv:
f.write(" throw new UnsupportedOperationException();\n")
- f.write(" }\n\n")
- return
- f.write(" assert blocksOffset + iterations * blockCount() <= blocks.length;\n")
- f.write(" assert valuesOffset + iterations * valueCount() <= values.length;\n")
- f.write(" for (int i = 0; i < iterations; ++i) {\n")
- mask = (1 << bpv) - 1
- for i in xrange(0, values):
- block_offset = i * bpv / 64
- bit_offset = (i * bpv) % 64
- if bit_offset == 0:
- # start of block
- f.write(" final long block%d = blocks[blocksOffset++];\n" %block_offset);
- f.write(" values[valuesOffset++] = %sblock%d >>> %d%s;\n" %(cast_start, block_offset, 64 - bpv, cast_end))
- elif bit_offset + bpv == 64:
- # end of block
- f.write(" values[valuesOffset++] = %sblock%d & %dL%s;\n" %(cast_start, block_offset, mask, cast_end))
- elif bit_offset + bpv < 64:
- # middle of block
- f.write(" values[valuesOffset++] = %s(block%d >>> %d) & %dL%s;\n" %(cast_start, block_offset, 64 - bit_offset - bpv, mask, cast_end))
- else:
- # value spans across 2 blocks
- mask1 = (1 << (64 - bit_offset)) -1
- shift1 = bit_offset + bpv - 64
- shift2 = 64 - shift1
- f.write(" final long block%d = blocks[blocksOffset++];\n" %(block_offset + 1));
- f.write(" values[valuesOffset++] = %s((block%d & %dL) << %d) | (block%d >>> %d)%s;\n" %(cast_start, block_offset, mask1, shift1, block_offset + 1, shift2, cast_end))
- f.write(" }\n")
+ else:
+ f.write(" assert blocksOffset + iterations * blockCount() <= blocks.length;\n")
+ f.write(" assert valuesOffset + iterations * valueCount() <= values.length;\n")
+ f.write(" for (int i = 0; i < iterations; ++i) {\n")
+ mask = (1 << bpv) - 1
+ for i in xrange(0, values):
+ block_offset = i * bpv / 64
+ bit_offset = (i * bpv) % 64
+ if bit_offset == 0:
+ # start of block
+ f.write(" final long block%d = blocks[blocksOffset++];\n" %block_offset);
+ f.write(" values[valuesOffset++] = %sblock%d >>> %d%s;\n" %(cast_start, block_offset, 64 - bpv, cast_end))
+ elif bit_offset + bpv == 64:
+ # end of block
+ f.write(" values[valuesOffset++] = %sblock%d & %dL%s;\n" %(cast_start, block_offset, mask, cast_end))
+ elif bit_offset + bpv < 64:
+ # middle of block
+ f.write(" values[valuesOffset++] = %s(block%d >>> %d) & %dL%s;\n" %(cast_start, block_offset, 64 - bit_offset - bpv, mask, cast_end))
+ else:
+ # value spans across 2 blocks
+ mask1 = (1 << (64 - bit_offset)) -1
+ shift1 = bit_offset + bpv - 64
+ shift2 = 64 - shift1
+ f.write(" final long block%d = blocks[blocksOffset++];\n" %(block_offset + 1));
+ f.write(" values[valuesOffset++] = %s((block%d & %dL) << %d) | (block%d >>> %d)%s;\n" %(cast_start, block_offset, mask1, shift1, block_offset + 1, shift2, cast_end))
+ f.write(" }\n")
f.write(" }\n\n")
f.write(" public void decode(byte[] blocks, int blocksOffset, %s[] values, int valuesOffset, int iterations) {\n" %typ)
if bits < bpv:
f.write(" throw new UnsupportedOperationException();\n")
- f.write(" }\n\n")
- return
- f.write(" assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;\n")
- f.write(" assert valuesOffset + iterations * valueCount() <= values.length;\n")
- f.write(" for (int i = 0; i < iterations; ++i) {\n")
- blocks = values * bpv / 8
- for i in xrange(0, values):
- byte_start = i * bpv / 8
- bit_start = (i * bpv) % 8
- byte_end = ((i + 1) * bpv - 1) / 8
- bit_end = ((i + 1) * bpv - 1) % 8
- shift = lambda b: 8 * (byte_end - b - 1) + 1 + bit_end
- if bit_start == 0:
- f.write(" final %s byte%d = blocks[blocksOffset++] & 0xFF;\n" %(typ, byte_start))
- for b in xrange(byte_start + 1, byte_end + 1):
- f.write(" final %s byte%d = blocks[blocksOffset++] & 0xFF;\n" %(typ, b))
- f.write(" values[valuesOffset++] =")
- if byte_start == byte_end:
+ else:
+ f.write(" assert blocksOffset + 8 * iterations * blockCount() <= blocks.length;\n")
+ f.write(" assert valuesOffset + iterations * valueCount() <= values.length;\n")
+ f.write(" for (int i = 0; i < iterations; ++i) {\n")
+ blocks = values * bpv / 8
+ for i in xrange(0, values):
+ byte_start = i * bpv / 8
+ bit_start = (i * bpv) % 8
+ byte_end = ((i + 1) * bpv - 1) / 8
+ bit_end = ((i + 1) * bpv - 1) % 8
+ shift = lambda b: 8 * (byte_end - b - 1) + 1 + bit_end
if bit_start == 0:
- if bit_end == 7:
- f.write(" byte%d" %byte_start)
+ f.write(" final %s byte%d = blocks[blocksOffset++] & 0xFF;\n" %(typ, byte_start))
+ for b in xrange(byte_start + 1, byte_end + 1):
+ f.write(" final %s byte%d = blocks[blocksOffset++] & 0xFF;\n" %(typ, b))
+ f.write(" values[valuesOffset++] =")
+ if byte_start == byte_end:
+ if bit_start == 0:
+ if bit_end == 7:
+ f.write(" byte%d" %byte_start)
+ else:
+ f.write(" byte%d >>> %d" %(byte_start, 7 - bit_end))
else:
- f.write(" byte%d >>> %d" %(byte_start, 7 - bit_end))
+ if bit_end == 7:
+ f.write(" byte%d & %d" %(byte_start, 2 ** (8 - bit_start) - 1))
+ else:
+ f.write(" (byte%d >>> %d) & %d" %(byte_start, 7 - bit_end, 2 ** (bit_end - bit_start + 1) - 1))
else:
+ if bit_start == 0:
+ f.write(" (byte%d << %d)" %(byte_start, shift(byte_start)))
+ else:
+ f.write(" ((byte%d & %d) << %d)" %(byte_start, 2 ** (8 - bit_start) - 1, shift(byte_start)))
+ for b in xrange(byte_start + 1, byte_end):
+ f.write(" | (byte%d << %d)" %(b, shift(b)))
if bit_end == 7:
- f.write(" byte%d & %d" %(byte_start, 2 ** (8 - bit_start) - 1))
+ f.write(" | byte%d" %byte_end)
else:
- f.write(" (byte%d >>> %d) & %d" %(byte_start, 7 - bit_end, 2 ** (bit_end - bit_start + 1) - 1))
- else:
- if bit_start == 0:
- f.write(" (byte%d << %d)" %(byte_start, shift(byte_start)))
- else:
- f.write(" ((byte%d & %d) << %d)" %(byte_start, 2 ** (8 - bit_start) - 1, shift(byte_start)))
- for b in xrange(byte_start + 1, byte_end):
- f.write(" | (byte%d << %d)" %(b, shift(b)))
- if bit_end == 7:
- f.write(" | byte%d" %byte_end)
- else:
- f.write(" | (byte%d >>> %d)" %(byte_end, 7 - bit_end))
- f.write(";\n")
- f.write(" }\n")
+ f.write(" | (byte%d >>> %d)" %(byte_end, 7 - bit_end))
+ f.write(";\n")
+ f.write(" }\n")
f.write(" }\n\n")
def p64_encode(bpv, f, bits, values):