Skip to content
Snippets Groups Projects
Commit 8537f9ea authored by wlott's avatar wlott
Browse files

Fixed with-mumble-string(s) macros to not say (the simple-string foo) when

foo isn't a simple-string.
parent 30cedf2f
No related branches found
No related tags found
No related merge requests found
...@@ -65,8 +65,7 @@ ...@@ -65,8 +65,7 @@
(with-array-data ((,data ,string :offset-var ,offset) (with-array-data ((,data ,string :offset-var ,offset)
(,data-start ,start) (,data-start ,start)
(,data-end (or ,end (,data-end (or ,end
(length (the simple-string (length (the vector ,string)))))
,string)))))
(psetq ,string ,data (psetq ,string ,data
,cum-offset ,offset ,cum-offset ,offset
,start ,data-start ,start ,data-start
...@@ -87,7 +86,7 @@ ...@@ -87,7 +86,7 @@
(if (array-header-p ,string) (if (array-header-p ,string)
(with-array-data ((data ,string) (with-array-data ((data ,string)
(data-start start) (data-start start)
(data-end (length (the simple-string ,string)))) (data-end (length (the vector ,string))))
(psetq ,string data (psetq ,string data
start data-start start data-start
end data-end)) end data-end))
...@@ -114,8 +113,7 @@ ...@@ -114,8 +113,7 @@
(with-array-data ((,data ,string1 :offset-var ,offset) (with-array-data ((,data ,string1 :offset-var ,offset)
(,data-start ,start1) (,data-start ,start1)
(,data-end (or ,end1 (,data-end (or ,end1
(length (the simple-string (length (the vector ,string1)))))
,string1)))))
(psetq ,string1 ,data (psetq ,string1 ,data
,cum-offset-1 ,offset ,cum-offset-1 ,offset
,start1 ,data-start ,start1 ,data-start
...@@ -125,8 +123,7 @@ ...@@ -125,8 +123,7 @@
(with-array-data ((,data ,string2) (with-array-data ((,data ,string2)
(,data-start ,start2) (,data-start ,start2)
(,data-end (or ,end2 (,data-end (or ,end2
(length (the simple-string (length (the vector ,string2)))))
,string2)))))
(psetq ,string2 ,data (psetq ,string2 ,data
,start2 ,data-start ,start2 ,data-start
,end2 ,data-end)) ,end2 ,data-end))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment