Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-01-10 20:30:23 +00:00
Code Issues Projects Releases Wiki Activity

small refactor to prepare for better range dt adjustment

Browse Source
This commit is contained in:
Irmen de Jong 2024-10-02 23:15:48 +02:00
parent fff0d741c3
commit bf33a4f82d
3 changed files with 53 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
compiler/src/prog8/compiler/astprocessing/TypecastsAdder.kt
View File

@ -341,14 +341,33 @@ class TypecastsAdder(val program: Program, val options: CompilationOptions, val
}
return noModifications
}
override fun after(range: RangeExpression, parent: Node): Iterable<IAstModification> {
val fromDt = range.from.inferType(program).getOr(DataType.UNDEFINED)
val toDt = range.to.inferType(program).getOr(DataType.UNDEFINED)
val fromConst = range.from.constValue(program)
val toConst = range.to.constValue(program)
val varDt = if (parent is ContainmentCheck)
parent.element.inferType(program)
else if (parent is ForLoop)
parent.loopVarDt(program)
else
InferredTypes.InferredType.unknown()
return adjustRangeDts(range, fromConst, fromDt, toConst, toDt, varDt.getOr(DataType.UNDEFINED), parent)
}
private fun adjustRangeDts(
range: RangeExpression,
fromConst: NumericLiteral?,
fromDt: DataType,
toConst: NumericLiteral?,
toDt: DataType,
varDt: DataType,
parent: Node
): List<IAstModification> {
if(fromConst!=null) {
val smaller = NumericLiteral.optimalInteger(fromConst.number.toInt(), fromConst.position)
if(fromConst.type.largerThan(smaller.type)) {
if(fromDt.largerThan(smaller.type)) {
val toType = range.to.inferType(program)
if(toType isnot smaller.type) {
if(toConst!=null) {
@ -367,7 +386,7 @@ class TypecastsAdder(val program: Program, val options: CompilationOptions, val
}
if(toConst!=null) {
val smaller = NumericLiteral.optimalInteger(toConst.number.toInt(), toConst.position)
if(toConst.type.largerThan(smaller.type)) {
if(toDt.largerThan(smaller.type)) {
val fromType = range.from.inferType(program)
if(fromType isnot smaller.type) {
if(fromConst!=null) {
@ -386,8 +405,6 @@ class TypecastsAdder(val program: Program, val options: CompilationOptions, val
}
val modifications = mutableListOf<IAstModification>()
val fromDt = range.from.inferType(program).getOr(DataType.UNDEFINED)
val toDt = range.to.inferType(program).getOr(DataType.UNDEFINED)
val (commonDt, toChange) = BinaryExpression.commonDatatype(fromDt, toDt, range.from, range.to)
if(toChange!=null)
addTypecastOrCastedValueModification(modifications, toChange, commonDt, range)

4
docs/source/todo.rst
View File

@ -1,9 +1,7 @@
TODO
====
word starw; for starw in 50 downto 0 -> compiler error word loop variable can only loop over bytes or words
chess prg got bigger again. why?
word starw; for starw in 50 downto 0 -> compiler error word loop variable can only loop over bytes or words FIX in adjustRangeDts() most likely
Regenerate skeleton doc files.

40
examples/test.p8
View File

@ -4,22 +4,42 @@
main {
sub start() {
uword uw
for uw in 50 downto 10 {
cx16.r0++
}
bool[256] cells
word starw
byte bb
uword uw
ubyte ub
for starw in 50 downto 10 { ; TODO fix compiler error + add unit test for this
cx16.r0++
}
for starw in cx16.r0L downto 10 { ; TODO fix compiler error + add unit test for this
cx16.r0++
}
for ub in 0 to len(cells)-1 {
cx16.r0++
}
for ub in cx16.r0L to len(cells)-1 {
cx16.r0++
}
for bb in 50 downto 10 {
cx16.r0++
}
for bb in cx16.r0sL downto 10 {
cx16.r0++
}
ubyte[] stuff1=[1,2,3]
ubyte [] stuff2=[1,2,3]
ubyte[ ] stuff3=[1,2,3]
stuff1[1]++
stuff2[1]++
stuff3[1]++
; for starw in 500 downto 10 {
; cx16.r0++
; }
; for uw in 50 downto 10 {
; cx16.r0++
; }
; for uw in 500 downto 10 {
; cx16.r0++
; }
}
}