From 2d43c6917837cdb09f62461486b68bd432b188a1 Mon Sep 17 00:00:00 2001 From: Humza Shahid Date: Mon, 18 Aug 2025 02:56:25 +0100 Subject: [PATCH] fix compiler errors (illegal tokens in two files) introduced in previous commit --- fonts/lower-case-j.sml | 60 +++++++++++++++++++++--------------------- fonts/lower-case-t.sml | 36 ++++++++++++------------- fonts/upper-case-x.sml | 2 +- 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/fonts/lower-case-j.sml b/fonts/lower-case-j.sml index fd23fc9..0731d47 100644 --- a/fonts/lower-case-j.sml +++ b/fonts/lower-case-j.sml @@ -14,94 +14,94 @@ struct #[ xToNdc (xOffset, 0.000000000000000, scale, halfWidth), yToNdc (yOffset, 10.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 1.000000000000000, scale, halfWidth), yToNdc (yOffset, 10.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), yToNdc (yOffset, 9.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), yToNdc (yOffset, 9.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 1.000000000000000, scale, halfWidth), yToNdc (yOffset, 10.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 1.000000000000000, scale, halfWidth), yToNdc (yOffset, 9.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 1.000000000000000, scale, halfWidth), yToNdc (yOffset, 4.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 3.000000000000000, scale, halfWidth), yToNdc (yOffset, 4.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 1.000000000000000, scale, halfWidth), yToNdc (yOffset, 3.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 1.000000000000000, scale, halfWidth), yToNdc (yOffset, 3.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 3.000000000000000, scale, halfWidth), yToNdc (yOffset, 4.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 3.000000000000000, scale, halfWidth), yToNdc (yOffset, 3.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 1.000000000000000, scale, halfWidth), yToNdc (yOffset, 11.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 2.000000000000000, scale, halfWidth), yToNdc (yOffset, 11.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 1.000000000000000, scale, halfWidth), yToNdc (yOffset, 10.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 1.000000000000000, scale, halfWidth), yToNdc (yOffset, 10.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 2.000000000000000, scale, halfWidth), yToNdc (yOffset, 11.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 2.000000000000000, scale, halfWidth), yToNdc (yOffset, 10.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 2.000000000000000, scale, halfWidth), yToNdc (yOffset, 2.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 3.000000000000000, scale, halfWidth), yToNdc (yOffset, 2.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 2.000000000000000, scale, halfWidth), yToNdc (yOffset, 1.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 2.000000000000000, scale, halfWidth), yToNdc (yOffset, 1.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 3.000000000000000, scale, halfWidth), yToNdc (yOffset, 2.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 3.000000000000000, scale, halfWidth), yToNdc (yOffset, 1.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 2.000000000000000, scale, halfWidth), yToNdc (yOffset, 10.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 3.000000000000000, scale, halfWidth), yToNdc (yOffset, 10.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 2.000000000000000, scale, halfWidth), yToNdc (yOffset, 3.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 2.000000000000000, scale, halfWidth), yToNdc (yOffset, 3.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 3.000000000000000, scale, halfWidth), yToNdc (yOffset, 10.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 3.000000000000000, scale, halfWidth), yToNdc (yOffset, 3.000000000000000, scale, halfHeight), -r, g, b. +r, g, b ] end end diff --git a/fonts/lower-case-t.sml b/fonts/lower-case-t.sml index 627784d..22ce906 100644 --- a/fonts/lower-case-t.sml +++ b/fonts/lower-case-t.sml @@ -14,58 +14,58 @@ struct #[ xToNdc (xOffset, 0.000000000000000, scale, halfWidth), yToNdc (yOffset, 5.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 4.000000000000000, scale, halfWidth), yToNdc (yOffset, 5.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), yToNdc (yOffset, 4.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), yToNdc (yOffset, 4.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 4.000000000000000, scale, halfWidth), yToNdc (yOffset, 5.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 4.000000000000000, scale, halfWidth), yToNdc (yOffset, 4.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 1.000000000000000, scale, halfWidth), yToNdc (yOffset, 9.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 2.000000000000000, scale, halfWidth), yToNdc (yOffset, 9.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 1.000000000000000, scale, halfWidth), yToNdc (yOffset, 2.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 1.000000000000000, scale, halfWidth), yToNdc (yOffset, 2.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 2.000000000000000, scale, halfWidth), yToNdc (yOffset, 9.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 2.000000000000000, scale, halfWidth), yToNdc (yOffset, 2.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 2.000000000000000, scale, halfWidth), yToNdc (yOffset, 10.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 4.000000000000000, scale, halfWidth), yToNdc (yOffset, 10.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 2.000000000000000, scale, halfWidth), yToNdc (yOffset, 9.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 2.000000000000000, scale, halfWidth), yToNdc (yOffset, 9.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 4.000000000000000, scale, halfWidth), yToNdc (yOffset, 10.000000000000000, scale, halfHeight), -r, g, b., +r, g, b, xToNdc (xOffset, 4.000000000000000, scale, halfWidth), yToNdc (yOffset, 9.000000000000000, scale, halfHeight), -r, g, b. +r, g, b ] end end diff --git a/fonts/upper-case-x.sml b/fonts/upper-case-x.sml index 1196f75..2db1343 100644 --- a/fonts/upper-case-x.sml +++ b/fonts/upper-case-x.sml @@ -6,7 +6,7 @@ struct fun yToNdc (yOffset, ypos, scale, halfHeight) = ~(((ypos * scale + yOffset) - halfHeight) / halfHeight) - fun lerp (xOffset, yOffset, scale, windowWidth, windowHeight, r, g, b) = + fun lerp (xOffset: Real32.real, yOffset, scale, windowWidth, windowHeight, r, g, b) = let val halfWidth = windowWidth / 2.0 val halfHeight = windowHeight / 2.0