From d75b71297426ee2d63d5630d1ef9469de48aca84 Mon Sep 17 00:00:00 2001 From: Kartik Agaram Date: Thu, 1 Oct 2020 20:40:22 -0700 Subject: 6923 --- prototypes/browse/17-file-state-broken/README.md | 7 -- .../browse/17-file-state-broken/file-state.mu | 34 ------- prototypes/browse/17-file-state-broken/main.mu | 106 --------------------- .../17-file-state-broken/screen-position-state.mu | 50 ---------- 4 files changed, 197 deletions(-) delete mode 100644 prototypes/browse/17-file-state-broken/README.md delete mode 100644 prototypes/browse/17-file-state-broken/file-state.mu delete mode 100644 prototypes/browse/17-file-state-broken/main.mu delete mode 100644 prototypes/browse/17-file-state-broken/screen-position-state.mu (limited to 'prototypes/browse/17-file-state-broken') diff --git a/prototypes/browse/17-file-state-broken/README.md b/prototypes/browse/17-file-state-broken/README.md deleted file mode 100644 index 7605c390..00000000 --- a/prototypes/browse/17-file-state-broken/README.md +++ /dev/null @@ -1,7 +0,0 @@ -More OO. Create a similar set of helpers for reading characters from disk. - -It's surprising that state for supporting headings needs to go into the state -maintained while reading the file from disk. - -Since we now have two 'classes', it seems worth splitting up into multiple -files. diff --git a/prototypes/browse/17-file-state-broken/file-state.mu b/prototypes/browse/17-file-state-broken/file-state.mu deleted file mode 100644 index c4339cef..00000000 --- a/prototypes/browse/17-file-state-broken/file-state.mu +++ /dev/null @@ -1,34 +0,0 @@ -type file-state { - source: (handle buffered-file) - at-start-of-line?: boolean - heading-level?: int -} - -fn init-file-state self: (addr file-state), filename: (addr array byte) { -#? var file/esi: (addr buffered-file) <- load-file filename - load-buffer-file self, filename - # self->at-start-of-line? = true - # self->heading-level? = 0 -} - -fn done-reading? self: (addr file-state) -> result/eax: boolean { -} - -fn load-file filename: (addr array byte) -> out/esi: (addr buffered-file) { - var result: (handle buffered-file) - { - var tmp1/eax: (addr handle buffered-file) <- address result - open filename, 0, tmp1 - } - var tmp2/eax: (addr buffered-file) <- lookup result - out <- copy tmp2 -} - -fn dump in: (addr buffered-file) { - var c/eax: byte <- read-byte-buffered in - compare c, 0xffffffff # EOF marker - break-if-= - var g/eax: grapheme <- copy c - print-grapheme 0, g - loop -} diff --git a/prototypes/browse/17-file-state-broken/main.mu b/prototypes/browse/17-file-state-broken/main.mu deleted file mode 100644 index 7ccd4b4b..00000000 --- a/prototypes/browse/17-file-state-broken/main.mu +++ /dev/null @@ -1,106 +0,0 @@ -fn main args: (addr array addr array byte) -> exit-status/ebx: int { - # initialize fs from args[1] - var filename/eax: (addr array byte) <- first-arg args - var file-state-storage: file-state - var fs/esi: (addr file-state) <- address file-state-storage - init-file-state fs, filename - # - enable-screen-grid-mode - enable-keyboard-immediate-mode - # initialize screen state from screen size - var nrows/eax: int <- copy 0 - var ncols/ecx: int <- copy 0 - nrows, ncols <- screen-size 0 - var screen-position-state-storage: screen-position-state - var screen-position-state: (addr screen-position-state) - init-screen-position-state screen-position-state, nrows, ncols - { - var done?/eax: boolean <- done-reading? fs - compare done?, 0 - break-if-= - render fs, screen-position-state - var key/eax: grapheme <- read-key-from-real-keyboard - compare key, 0x71 # 'q' - loop-if-!= - } - enable-keyboard-type-mode - enable-screen-type-mode - exit-status <- copy 0 -} - -fn render fs: (addr file-state), state: (addr screen-position-state) { - start-drawing state - render-normal fs, state -} - -fn render-normal fs: (addr file-state), state: (addr screen-position-state) { - { - # if done-drawing?(state) break - var done?/eax: boolean <- done-drawing? state - compare done?, 0 - break-if-!= - # - var c/eax: byte <- next-char fs - # if (c == EOF) break - compare c, 0xffffffff # EOF marker - break-if-= - # if (c == '*') start-bold 0,, render-until-asterisk(fs, state), reset - # else if (c == '_') start-bold 0,, render-until-underscore(fs, state), reset - # else if (c == '#' and fs is at start of line) compute-color, start color, render-header-line(fs, state), reset - # else add-char(state, c) - } -} - -fn render-until-asterisk fs: (addr file-state), state: (addr screen-position-state) { - { - # if done-drawing?(state) break - var done?/eax: boolean <- done-drawing? state - compare done?, 0 - break-if-!= - # - var c/eax: byte <- next-char fs - # if (c == EOF) break - compare c, 0xffffffff # EOF marker - break-if-= - # if (c == '*') break - # else add-char(state, c) - } -} - -fn render-until-underscore fs: (addr file-state), state: (addr screen-position-state) { - { - # if done-drawing?(state) break - var done?/eax: boolean <- done-drawing? state - compare done?, 0 - break-if-!= - # - var c/eax: byte <- next-char fs - # if (c == EOF) break - compare c, 0xffffffff # EOF marker - break-if-= - # if (c == '_') break - # else add-char(state, c) - } -} - -fn render-header-line fs: (addr file-state), state: (addr screen-position-state) { - { - # if done-drawing?(state) break - var done?/eax: boolean <- done-drawing? state - compare done?, 0 - break-if-!= - # - var c/eax: byte <- next-char fs - # if (c == EOF) break - compare c, 0xffffffff # EOF marker - break-if-= - # if (c == '*') break - # else add-char(state, c) - } -} - -fn first-arg args-on-stack: (addr array addr array byte) -> out/eax: (addr array byte) { - var args/eax: (addr array addr array byte) <- copy args-on-stack - var result/eax: (addr addr array byte) <- index args, 1 - out <- copy *result -} diff --git a/prototypes/browse/17-file-state-broken/screen-position-state.mu b/prototypes/browse/17-file-state-broken/screen-position-state.mu deleted file mode 100644 index e5767de8..00000000 --- a/prototypes/browse/17-file-state-broken/screen-position-state.mu +++ /dev/null @@ -1,50 +0,0 @@ -type screen-position-state { - nrows: int # const - ncols: int # const - toprow: int - botrow: int - leftcol: int - rightcol: int - row: int - col: int -} - -fn init-screen-position-state self: (addr screen-position-state), nrows: int, ncols: int { - # hardcoded parameters: - # top-margin - # page-margin - # page-width - var dest/eax: (addr int) <- copy 0 - # self->nrows = nrows - # self->ncols = ncols - # self->toprow = top-margin - # self->botrow = nrows - # self->leftcol = page-margin - # self->rightcol = self->leftcol + page-width - # start-drawing(self) -} - -fn start-drawing self: (addr screen-position-state) { - # self->row = toprow - # self->col = leftcol -} - -fn add-char self: (addr screen-position-state), c: byte { - # print c - # self->col++ - # if (self->col > self->rightcol) next-line(self) -} - -fn next-line self: (addr screen-position-state) { - # self->row++ - # if (self->row > self->botrow) next-page(self) -} - -fn next-page self: (addr screen-position-state) { - # self->leftcol = self->rightcol + 5 - # self->rightcol = self->leftcol + page-width -} - -fn done-drawing? self: (addr screen-position-state) -> result/eax: boolean { - # self->rightcol >= self->ncols -} -- cgit 1.4.1-2-gfad0