introduced strcmp() builtin function

This commit is contained in:
Irmen de Jong 2020-10-16 18:11:25 +02:00
parent a03e36828a
commit 4d01a78731
6 changed files with 32 additions and 25 deletions

View File

@ -2130,3 +2130,20 @@ _startloop dey
rts rts
.pend .pend
func_strcmp .proc
; -- compares strings in s1 (AY) and s2 (P8ZP_SCRATCH_W2).
; Returns -1,0,1 in A, depeding on the ordering. Clobbers Y.
inx
lda P8ESTACK_LO,x
sta P8ZP_SCRATCH_W2
lda P8ESTACK_HI,x
sta P8ZP_SCRATCH_W2+1
lda P8ESTACK_HI+1,x
tay
lda P8ESTACK_LO+1,x
jsr strcmp_mem
sta P8ESTACK_LO+1,x
rts
.pend

View File

@ -6,20 +6,4 @@
prog8_lib { prog8_lib {
%asminclude "library:prog8_lib.asm", "" %asminclude "library:prog8_lib.asm", ""
sub strcmp(uword s1, uword s2) -> byte {
; -- convenience wrapper for plain Prog8 to compare strings TODO turn this into a builtin function
byte result
%asm {{
lda s2
sta P8ZP_SCRATCH_W2
lda s2+1
sta P8ZP_SCRATCH_W2+1
lda s1
ldy s1+1
jsr prog8_lib.strcmp_mem
sta result
}}
return result
}
} }

View File

@ -101,7 +101,8 @@ val BuiltinFunctions = mapOf(
"rightstr" to FSignature(false, listOf( "rightstr" to FSignature(false, listOf(
FParam("source", IterableDatatypes + DataType.UWORD), FParam("source", IterableDatatypes + DataType.UWORD),
FParam("target", IterableDatatypes + DataType.UWORD), FParam("target", IterableDatatypes + DataType.UWORD),
FParam("length", setOf(DataType.UBYTE))), null) FParam("length", setOf(DataType.UBYTE))), null),
"strcmp" to FSignature(false, listOf(FParam("s1", IterableDatatypes + DataType.UWORD), FParam("s2", IterableDatatypes + DataType.UWORD)), DataType.BYTE, null)
) )
fun builtinMax(array: List<Number>): Number = array.maxByOrNull { it.toDouble() }!! fun builtinMax(array: List<Number>): Number = array.maxByOrNull { it.toDouble() }!!

View File

@ -733,9 +733,12 @@ sum(x)
sort(array) sort(array)
Sort the array in ascending order (in-place) Sort the array in ascending order (in-place)
Note: sorting a floating-point array is not supported right now, as a general sorting routine for this will Supported are arrays of bytes or word values.
be extremely slow. Either build one yourself or find another solution that doesn't require sorting Sorting a floating-point array is not supported right now, as a general sorting routine for this will
floating point values. be extremely slow. Either build one yourself or find another solution that doesn't require sorting.
Finally, note that sorting an array with strings in it will not do what you might think;
it considers the array as just an array of integer words and sorts the string *pointers* accordingly.
Sorting strings alphabetically has to be programmed yourself if you need it.
reverse(array) reverse(array)
Reverse the values in the array (in-place). Reverse the values in the array (in-place).
@ -844,6 +847,9 @@ substr(source, target, start, length)
It is assumed the target string buffer is large enough to contain the result. It is assumed the target string buffer is large enough to contain the result.
Modifies in-place, doesn't return a value (so can't be used in an expression). Modifies in-place, doesn't return a value (so can't be used in an expression).
strcmp(string1, string2)
Returns -1, 0 or 1 depeding on wether string1 sorts before, equal or after string2.
swap(x, y) swap(x, y)
Swap the values of numerical variables (or memory locations) x and y in a fast way. Swap the values of numerical variables (or memory locations) x and y in a fast way.

View File

@ -3,7 +3,6 @@ TODO
==== ====
- get rid of all other TODO's in the code ;-) - get rid of all other TODO's in the code ;-)
- introduce strcmp()
- modify string comparison expressions to use strcmp() automatically - modify string comparison expressions to use strcmp() automatically
- only allow array indexing via a number, a variable, or a typecast of one of those (eliminate complex expression calcs for array indexing, force explicit use of an index variable) - only allow array indexing via a number, a variable, or a typecast of one of those (eliminate complex expression calcs for array indexing, force explicit use of an index variable)
- implement @stack for asmsub parameters - implement @stack for asmsub parameters

View File

@ -13,16 +13,16 @@ main {
str hex4 = "aap3333" str hex4 = "aap3333"
byte result byte result
result = prog8_lib.strcmp(hex1, hex1) result = strcmp(hex1, hex1)
txt.print_b(result) txt.print_b(result)
txt.chrout('\n') txt.chrout('\n')
result = prog8_lib.strcmp(hex1, hex2) result = strcmp(hex1, hex2)
txt.print_b(result) txt.print_b(result)
txt.chrout('\n') txt.chrout('\n')
result = prog8_lib.strcmp(hex1, hex3) result = strcmp(hex1, hex3)
txt.print_b(result) txt.print_b(result)
txt.chrout('\n') txt.chrout('\n')
result = prog8_lib.strcmp(hex1, hex4) result = strcmp(hex1, hex4)
txt.print_b(result) txt.print_b(result)
txt.chrout('\n') txt.chrout('\n')