A few minor changes

Author: copumpkin

README.md

@@ -0,0 +1,2 @@
+Still very much a work in progress. The pickler stuff will eventually get split out into another library since very little of it is specific to java, but I'm keeping it in here until I'm more satisfied with it.
+

src/Data/Prickler.hs

@@ -248,6 +248,19 @@ float = error "foo"
 double :: Prickler Double
 double = error "bar"
 
+delimited :: Integral i => Prickler i -> Prickler a -> Prickler a
+delimited (Prickler gi pi) (Prickler ga pa) = Prickler getter putter
+  where
+  getter = do
+    len <- gi
+    bs  <- getLazyByteString (fromIntegral len)
+    return $ runGet ga bs
+
+  putter xs = undefined
+
+all :: G.Vector v a => Prickler a -> Prickler (v a)
+all = undefined
+
 byteString :: Integral i => Prickler i -> Prickler BL.ByteString
 byteString (Prickler gi pi) = Prickler getter putter
   where

src/Java/ClassFormat/Encoding.hs

@@ -4,6 +4,7 @@ module Java.ClassFormat.Encoding where
 import Data.Char
 import Data.Word
 import Data.Maybe
+import Data.Tuple
 import Data.Monoid
 import Data.Prickler
 import qualified Data.Vector as V
@@ -75,43 +76,14 @@ attribute cpool = taggedSized con2 word32be (EliminatorWrapper . elim_Attribute)
   attr = fmap Con2 . flip M.lookup tagMap
 
   tagMap :: M.Map BL.ByteString Word16
-  tagMap = M.fromList . mapMaybe (\(i, x) -> fmap (flip (,) i) (x ^? _Utf8)) . zip [1..] . V.toList $ cpool
+  tagMap = M.fromList . mapMaybe (_1 (^? _Utf8) $) . flip zip [1..] . V.toList $ cpool
 
 -- attribute = undefined
 
 entity        attribute = untagged elim_Entity        . alt Entity        $ word16be :> con2 :> con2 :> gvector word16be attribute :> Nil
 codeAttribute attribute = untagged elim_CodeAttribute . alt CodeAttribute $ word16be :> word16be :> byteString word32be :> gvector word16be exception :> gvector word16be attribute :> Nil
 
 
-
-
-{-
-data Attribute
-  = ConstantValue Con2
-  | Code !CodeAttribute
-  | StackMapTable
-  | Exceptions !(V.Vector Con2)
-  | InnerClasses !(V.Vector InnerClass)
-  | EnclosingMethod !Con2 !Con2
-  | Synthetic -- empty
-  | Signature !Con2
-  | SourceFile !Con2
-  | SourceDebugExtension !B.ByteString
-  | LineNumberTable !(U.Vector (Word16, Word16))
-  | LocalVariableTable !(V.Vector LocalVariable)
-  | LocalVariableTypeTable !(V.Vector LocalVariable)
-  | Deprecated -- empty
-  | RuntimeVisibleAnnotations !(V.Vector Annotation)
-  | RuntimeInvisibleAnnotations !(V.Vector Annotation)
-  | RuntimeVisibleParameterAnnotations !(V.Vector (V.Vector Annotation))
-  | RuntimeInvisibleParameterAnnotations !(V.Vector (V.Vector Annotation))
-  | AnnotationDefault !Value
-  | BootstrapMethods
-  | Custom B.ByteString
--}
-
-
-
 referenceKind = tagged word8 (EliminatorWrapper . elim_ReferenceKind)
   $  1 # alt Ref_getField         Nil
   :> 2 # alt Ref_getStatic        Nil
@@ -175,7 +147,7 @@ klass :: Prickler Class
 klass = skip (expect 0xcafebabe word32be) basicClass
 
 test = do
-  x <- BL.readFile "/Users/copumpkin/Sandbox/Scala/tinker/target/scala-2.10/classes/tinker/optimized/Main$.class"
+  x <- BL.readFile "/Users/copumpkin/Sandbox/Scala/tinker/target/scala-2.10/classes/tinker/optimized/Main$$anon$1.class"
   putStrLn (ppShow $ runGet (get klass) x)