Index: src/tests/.expect/user_literals.txt
===================================================================
--- src/tests/.expect/user_literals.txt	(revision f47ba55a98273c1959f3e815b06394ea92df54d0)
+++ src/tests/.expect/user_literals.txt	(revision eb68ebbea8e9add55bcca3222113cb374c7110f9)
@@ -5,2 +5,23 @@
 11.0714285714286
 22.0457142857143
+secs 1
+secs 23
+mins 23
+hours 23
+_A_ 23
+_thingy_ 1234
+secs 65535
+mins 65535
+hours 65535
+_A_ 65535
+_thingy_ 65535
+secs 10
+hours 10
+mins 10
+_A_ 10
+_thingy_ 10
+secs abc
+mins 0x4058c6
+hours 0x4058d0
+_A_ 0x4058d0
+_thingy_ abc
Index: src/tests/user_literals.c
===================================================================
--- src/tests/user_literals.c	(revision f47ba55a98273c1959f3e815b06394ea92df54d0)
+++ src/tests/user_literals.c	(revision eb68ebbea8e9add55bcca3222113cb374c7110f9)
@@ -10,9 +10,24 @@
 // Created On       : Wed Sep  6 21:40:50 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Sep  6 23:19:08 2017
-// Update Count     : 36
+// Last Modified On : Thu Sep  7 22:53:49 2017
+// Update Count     : 39
 // 
 
 #include <fstream>
+#include <wchar.h>
+#include <uchar.h>
+
+int ?`s( int s ) { sout | "secs" | s | endl; }
+int ?`m( int m ) { sout | "mins" | m | endl; }
+int ?`h( int h ) { sout | "hours" | h | endl; }
+int ?`_A_( int x ) { sout | "_A_" | x | endl; }
+int ?`__thingy_( int x ) { sout | "_thingy_" | x | endl; }
+
+int ?`s( const char * s ) { sout | "secs" | s | endl; }
+int ?`m( const char16_t * m ) { sout | "mins" | m | endl; }
+int ?`h( const char32_t * h ) { sout | "hours" | h | endl; }
+int ?`_A_( const wchar_t * x ) { sout | "_A_" | x | endl; }
+int ?`__thingy_( const char * x ) { sout | "_thingy_" | x | endl; }
+
 
 struct Weight {
@@ -28,4 +43,5 @@
 Weight ?`lb( double w ) { return (Weight){ w / 14.0 }; }
 Weight ?`kg( double w ) { return (Weight) { w * 0.1575}; }
+
 
 int main() {
@@ -43,7 +59,32 @@
     w = 5`st + 8`kg + 25`lb + hw;
     sout | w | endl;
-}
 
+//	0`secs;
+	1`s;
+	23`s;
+	23u`m;
+	23l`h;
+	23_ul`_A_;
+	1_234_LL`__thingy_;
 
+	0xff_ffl;
+	0xff_ff`s;
+	0xff_ffu`m;
+	0xff_ffl`h;
+	0xff_fful`_A_;
+	0xff_ffLL`__thingy_;
+
+    '\n'`s;
+    L'\n'`h;
+    u'\n'`m;
+    L_'\n'`_A_;
+    U_'\n'`__thingy_;
+
+	"abc"`s;
+	u"abc"`m;
+	U_"abc"`h;
+	L"abc"`_A_;
+	u8_"abc"`__thingy_;
+} // main
 
 // Local Variables: //