Typed zip

include/hx/zip/Compress.hpp

@@ -0,0 +1,19 @@
+#pragma once
+
+#include "Zip.hpp"
+
+HX_DECLARE_CLASS2(hx, zip, Compress)
+
+namespace hx
+{
+	namespace zip
+	{
+		struct Compress_obj : Zip_obj
+		{
+			static Compress create(int level);
+			static Array<uint8_t> run(cpp::marshal::View<uint8_t> src, int level);
+
+			virtual int getBounds(int length) = 0;
+		};
+	}
+}

include/hx/zip/Uncompress.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#include "Zip.hpp"
+
+HX_DECLARE_CLASS2(hx, zip, Uncompress)
+
+namespace hx
+{
+	namespace zip
+	{
+		struct Uncompress_obj : Zip_obj
+		{
+			static Uncompress create(int windowSize);
+			static Array<uint8_t> run(cpp::marshal::View<uint8_t> src, int bufferSize);
+		};
+	}
+}

include/hx/zip/Zip.hpp

@@ -0,0 +1,36 @@
+#pragma once
+
+#ifndef HXCPP_H
+#include <hxcpp.h>
+#endif
+
+HX_DECLARE_CLASS2(hx, zip, Zip)
+
+namespace hx
+{
+	namespace zip
+	{
+		enum Flush {
+			None,
+			Sync,
+			Full,
+			Finish,
+			Block
+		};
+
+		struct Result final {
+			const bool done;
+			const int read;
+			const int write;
+
+			Result(int inDone, int inRead, int inWrite);
+		};
+
+		struct Zip_obj : hx::Object
+		{
+			virtual Result execute(cpp::marshal::View<uint8_t> src, cpp::marshal::View<uint8_t> dst) = 0;
+			virtual void setFlushMode(Flush mode) = 0;
+			virtual void close() = 0;
+		};
+	}
+}

include/hxString.h

@@ -46,10 +46,8 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES String
    static String create(const char16_t *inPtr,int inLen=-1);
    static String create(const char *inPtr,int inLen=-1);
 
-#if (HXCPP_API_LEVEL>=500)
    static String create(const ::cpp::marshal::View<char>& buffer);
    static String create(const ::cpp::marshal::View<char16_t>& buffer);
-#endif
 
    // Uses non-gc memory and wont ever be collected
    static ::String createPermanent(const char *inUtf8, int inLen);
@@ -173,10 +171,8 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES String
    const wchar_t *wchar_str(hx::IStringAlloc *inBuffer = 0) const;
    const char16_t *wc_str(hx::IStringAlloc *inBuffer = 0, int *outCharLength = 0) const;
 
-#if (HXCPP_API_LEVEL >= 500)
    bool wc_str(::cpp::marshal::View<char16_t> buffer, int* outCharLength = nullptr) const;
    bool utf8_str(::cpp::marshal::View<char> buffer, int* outByteLength = nullptr) const;
-#endif
 
    const char *__CStr() const { return utf8_str(); };
    const wchar_t *__WCStr() const { return wchar_str(0); }

include/hxcpp.h

@@ -351,15 +351,13 @@ typedef PropertyAccessMode PropertyAccess;
 #endif
 #include <hx/StdLibs.h>
 #include <cpp/Pointer.h>
-#if (HXCPP_API_LEVEL>=500)
-    #include <cpp/marshal/Boxed.hpp>
-    #include <cpp/marshal/ValueType.hpp>
-    #include <cpp/marshal/PointerType.hpp>
-    #include <cpp/marshal/ValueReference.hpp>
-    #include <cpp/marshal/PointerReference.hpp>
-    #include <cpp/marshal/View.hpp>
-    #include <cpp/marshal/Marshal.hpp>
-#endif
+#include <cpp/marshal/Boxed.hpp>
+#include <cpp/marshal/ValueType.hpp>
+#include <cpp/marshal/PointerType.hpp>
+#include <cpp/marshal/ValueReference.hpp>
+#include <cpp/marshal/PointerReference.hpp>
+#include <cpp/marshal/View.hpp>
+#include <cpp/marshal/Marshal.hpp>
 #include <hx/Native.h>
 #include <hx/Operators.h>
 #include <hx/Functions.h>

src/String.cpp

@@ -788,7 +788,6 @@ String String::create(const char *inString,int inLength)
    return String(s,len);
 }
 
-#if (HXCPP_API_LEVEL>=500)
 String String::create(const::cpp::marshal::View<char>& buffer)
 {
     auto start = buffer.ptr.ptr;
@@ -824,7 +823,6 @@ String String::create(const cpp::marshal::View<char16_t>& buffer)
 
     return String::create(buffer.ptr.ptr, buffer.length - (end - start) - extra);
 }
-#endif
 
 String::String(const Dynamic &inRHS)
 {
@@ -1794,8 +1792,6 @@ const char16_t * String::wc_str(hx::IStringAlloc *inBuffer, int *outCharLength)
    return str;
 }
 
-#if (HXCPP_API_LEVEL >= 500)
-
 bool String::wc_str(::cpp::marshal::View<char16_t> buffer, int* outCharLength) const
 {
 #ifdef HX_SMART_STRINGS
@@ -1918,8 +1914,6 @@ bool String::utf8_str(::cpp::marshal::View<char> buffer, int* outByteLength) con
     return true;
 }
 
-#endif
-
 const wchar_t * String::wchar_str(hx::IStringAlloc *inBuffer) const
 {
    if (!__s)

src/hx/libs/zlib/Build.xml

@@ -1,42 +1,7 @@
-<xml>
-
-<pragma once="true" />
-
-<set name="ZLIB_DIR" value="${HXCPP}/project/thirdparty/zlib-1.3.1"/>
-
-<files id="hxcpp_zlib" dir="${this_dir}" >
-  <depend files="hxcpp-depends"/>
-  <depend name="${this_dir}/Build.xml" dateOnly="true" />
-  <cache value="true" asLibrary="1" />
-
-  <compilerflag value="-I${ZLIB_DIR}"/>
-  <compilerflag value="-DSTDC" unless="windows" />
-  <compilerflag value="-DHAVE_UNISTD_H" unless="windows" />
-
-  <file name="ZLib.cpp"/>
-
-  <!-- HXCPP_LINK_NO_ZLIB may be set too late, so use filterout as well. -->
-  <section unless="HXCPP_LINK_NO_ZLIB" >
-     <file name="${ZLIB_DIR}/adler32.c" filterout="HXCPP_LINK_NO_ZLIB" tags="" />
-     <file name="${ZLIB_DIR}/compress.c" filterout="HXCPP_LINK_NO_ZLIB" tags="" />
-     <file name="${ZLIB_DIR}/crc32.c" filterout="HXCPP_LINK_NO_ZLIB" tags="" />
-     <file name="${ZLIB_DIR}/deflate.c" filterout="HXCPP_LINK_NO_ZLIB" tags="" />
-     <file name="${ZLIB_DIR}/gzclose.c" filterout="HXCPP_LINK_NO_ZLIB" tags="" />
-     <file name="${ZLIB_DIR}/gzlib.c" filterout="HXCPP_LINK_NO_ZLIB" tags="" />
-     <file name="${ZLIB_DIR}/gzread.c" filterout="HXCPP_LINK_NO_ZLIB" tags="" />
-     <file name="${ZLIB_DIR}/gzwrite.c" filterout="HXCPP_LINK_NO_ZLIB" tags="" />
-     <file name="${ZLIB_DIR}/infback.c" filterout="HXCPP_LINK_NO_ZLIB" tags="" />
-     <file name="${ZLIB_DIR}/inffast.c" filterout="HXCPP_LINK_NO_ZLIB" tags="" />
-     <file name="${ZLIB_DIR}/inflate.c" filterout="HXCPP_LINK_NO_ZLIB" tags="" />
-     <file name="${ZLIB_DIR}/inftrees.c" filterout="HXCPP_LINK_NO_ZLIB" tags="" />
-     <file name="${ZLIB_DIR}/trees.c" filterout="HXCPP_LINK_NO_ZLIB" tags="" />
-     <file name="${ZLIB_DIR}/uncompr.c" filterout="HXCPP_LINK_NO_ZLIB" tags="" />
-     <file name="${ZLIB_DIR}/zutil.c" filterout="HXCPP_LINK_NO_ZLIB" tags="" />
-  </section>
-</files>
-
-<target id="haxe">
-  <files id="hxcpp_zlib" />
-</target>
-
-</xml>
+<xml>
+
+  <pragma once="true" />
+
+  <import name="${this_dir}/../../zip/Build.xml"/>
+
+</xml>