From 3f01a77fcad26449d6c83b83422b62ea88e18435 Mon Sep 17 00:00:00 2001 From: Dagen Brock Date: Mon, 4 Jul 2022 07:10:56 -0500 Subject: [PATCH] bump merlingo for tabs issue --- go.mod | 2 +- go.sum | 2 ++ testsrc/fmt.s | 26 ++++++++++++++++---------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 1985a23..6250fc6 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/digarok/appy go 1.16 require ( - github.com/digarok/merlingo v1.0.1 + github.com/digarok/merlingo v1.0.2 github.com/fatih/color v1.13.0 github.com/mitchellh/go-homedir v1.1.0 github.com/spf13/cobra v1.1.3 diff --git a/go.sum b/go.sum index d15d0cd..2fb51c9 100644 --- a/go.sum +++ b/go.sum @@ -39,6 +39,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/digarok/merlingo v1.0.1 h1:jAmUXvhQI+tzwlEjWEbclT1NZXZXef/P+ybFCTbdRUk= github.com/digarok/merlingo v1.0.1/go.mod h1:rdReR6enl/63dfkssdM4xwg0gXw3j4QprK9e+e8mX9U= +github.com/digarok/merlingo v1.0.2 h1:Pgl3exZAMdyLk2ILztNAFht6h8BVAiq/h1KgPtgT4oo= +github.com/digarok/merlingo v1.0.2/go.mod h1:rdReR6enl/63dfkssdM4xwg0gXw3j4QprK9e+e8mX9U= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= diff --git a/testsrc/fmt.s b/testsrc/fmt.s index 36481ec..0a10a71 100644 --- a/testsrc/fmt.s +++ b/testsrc/fmt.s @@ -1,18 +1,24 @@ * formatting test - org $300 ; start + org $300 ; start -main nop +main nop + * what about this - * what about this + ; and this - ; and this - - sta :jo+1 + sta :jo+1 -:jo+1 lda $400 - lda $400 - rts - +:jo+1 lda $400 + lda $400 + rts +** 24 (bit) hex to 8 (nibble) / 4 byte BCD +** 24 (bit) hex to +HEXDEC mx %11 + LDA #0 ; Ensure the result is clear + STA DEC8+0 + STA DEC8+1 + STA DEC8+2 + STA DEC8+3 ReallyThisisaLoooooongLabelwith stal $e12000,y ; look at this long line