Import Upstream version 5e3upstream/5e3

1 files changed, 26 insertions, 17 deletions

diff --git a/scm.h b/scm.h
index ab737a2..bf17d06 100644
--- a/scm.h
+++ b/scm.h
@@ -443,6 +443,7 @@ SCM_EXPORT long tc16_env, tc16_ident;
 #define SYMBOLP(x) (TYP7S(x)==tc7_ssymbol)
 #define STRINGP(x) (TYP7(x)==tc7_string)
 #define NSTRINGP(x) (!STRINGP(x))
+#define BYTESP(x) (TYP7(x)==tc7_VfixN8)
 #define VECTORP(x) (TYP7(x)==tc7_vector)
 #define NVECTORP(x) (!VECTORP(x))
 #define LENGTH(x) (((unsigned long)CAR(x))>>8)
@@ -520,9 +521,9 @@ SCM_EXPORT long tc16_array;
         case tc7_subr_2o:case tc7_lsubr_2:case tc7_lsubr
 #define tcs_symbols tc7_ssymbol:case tc7_msymbol
 #define tcs_bignums tc16_bigpos:case tc16_bigneg
-#define tcs_uves tc7_string:case tc7_bvect:\
-         case tc7_uvect:case tc7_ivect:case tc7_svect:\
-         case tc7_fvect:case tc7_dvect:case tc7_cvect
+#define tcs_uves tc7_string:case tc7_Vbool:case tc7_VfixN8:case tc7_VfixZ8:\
+  case tc7_VfixN16:case tc7_VfixZ16:case tc7_VfixN32:case tc7_VfixZ32:\
+  case tc7_VfloR32:case tc7_VfloC32:case tc7_VfloR64:case tc7_VfloC64
 
 #define tc3_cons_nimcar 0
 #define tc3_cons_imcar  2:case 4:case 6
@@ -534,20 +535,28 @@ SCM_EXPORT long tc16_array;
 #define tc7_msymbol     7
 #define tc7_string      13
 #define tc7_vector      15
-#define tc7_bvect       21
-/* spare 23 */
-#define tc7_ivect       29
-#define tc7_uvect       31
-#define tc7_svect       37
-/* spare 39 */
-#define tc7_fvect       45
-#define tc7_dvect       47
-#define tc7_cvect       53
-#define tc7_port        55
-#define tc7_contin      61
-#define tc7_specfun     63
-
-/* spare 69 71 77 79 */
+#define tc7_Vbool       21
+
+/* 23 */
+
+#define tc7_VfixN8      29
+#define tc7_VfixZ8      31
+#define tc7_VfixN16     37
+#define tc7_VfixZ16     39
+#define tc7_VfixN32     45
+#define tc7_VfixZ32     47
+
+#define tc7_VfloR32     53
+#define tc7_VfloC32     55
+#define tc7_VfloR64     61
+#define tc7_VfloC64     63
+
+/* 69 */
+
+#define tc7_port        71
+#define tc7_contin      77
+#define tc7_specfun     79
+
 #define tc7_subr_0      85
 #define tc7_subr_1      87
 #define tc7_cxr         93