Merge pull request #1347 from blackwhale/new-std-uni

New std.uni module
dlang · Aug 8, 2013 · c109594 · c109594
2 parents fde2d19 + 9a053d9
commit c109594
Show file tree

Hide file tree

Showing 8 changed files with 12,956 additions and 2,658 deletions.
diff --git a/posix.mak b/posix.mak
@@ -202,7 +202,7 @@ EXTRA_MODULES += $(EXTRA_DOCUMENTABLES) $(addprefix			\
 	std/internal/digest/, sha_SSSE3 ) $(addprefix \
 	std/internal/math/, biguintcore biguintnoasm biguintx86	\
 	gammafunction errorfunction) $(addprefix std/internal/, \
-	processinit uni uni_tab)
+	processinit uni uni_tab unicode_tables)
 
 # Aggregate all D modules relevant to this build
 D_MODULES = crc32 $(STD_MODULES) $(EXTRA_MODULES) $(STD_NET_MODULES) $(STD_DIGEST_MODULES)

diff --git a/std/internal/unicode_tables.d b/std/internal/unicode_tables.d
diff --git a/std/json.d b/std/json.d
@@ -596,7 +596,8 @@ unittest
     val = parseJSON(`"\u2660\u2666"`);
     assert(toJSON(&val) == "\"\&spades;\&diams;\"");
 
-    assertNotThrown(parseJSON(`{ "foo": "` ~ "\u007F" ~ `"}`));
+    //0x7F is a control character (see Unicode spec)
+    assertThrown(parseJSON(`{ "foo": "` ~ "\u007F" ~ `"}`));
 
     with(parseJSON(`""`))
         assert(str == "" && str !is null);

diff --git a/std/regex.d b/std/regex.d
@@ -225,15 +225,19 @@ module std.regex;
 import std.internal.uni, std.internal.uni_tab;//unicode property tables
 import std.array, std.algorithm, std.range,
        std.conv, std.exception, std.traits, std.typetuple,
-       std.uni, std.utf, std.format, std.typecons, std.bitmanip,
+       std.utf, std.format, std.typecons, std.bitmanip,
        std.functional, std.exception;
+
 import core.bitop, core.stdc.string, core.stdc.stdlib;
 static import ascii = std.ascii;
 import std.string : representation;
 
 debug import std.stdio;
 
 private:
+
+import std.uni : isAlpha, isWhite;
+
 @safe:
 
 //uncomment to get a barrage of debug info