From b6b22b5c5acbe317d7ad992b58169b0678e64a9a Mon Sep 17 00:00:00 2001 From: zlg Date: Thu, 29 Nov 2012 14:44:25 -0600 Subject: Clean up 1-13 and 1-20, correct 1-21 1-13 uses less variables and a for loop for the chart header 1-20 has minor changes 1-21 was rewritten to behave properly README has been rewritten to reflect the limitations of my solutions --- 1-21_entab.c | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) (limited to '1-21_entab.c') diff --git a/1-21_entab.c b/1-21_entab.c index 0f25706..6037a14 100644 --- a/1-21_entab.c +++ b/1-21_entab.c @@ -15,30 +15,41 @@ #define TABWIDTH 8 int main(void) { - int c, spaces; - spaces = 0; + int column, c, spaces; + spaces = column = 0; while ((c = getchar()) != EOF) { - // Make sure the character is a space... + // First thing's first, advance by a column. + column++; + if (c == ' ') { - ++spaces; - // When spaces is equal to TABWIDTH, we can add a tab - if (spaces == TABWIDTH) { + /* Add to 'spaces' immediately, we'll decide if it needs to be + * output later. + */ + spaces++; + + if (column % TABWIDTH == 0 && spaces > 0) { putchar('\t'); - spaces = 0; + spaces = 0; // No spaces are left when we tab! } + } else { - /* As soon as we hit a non-space character, we need to make sure - * there aren't 1-7 spaces leftover. These need to be output before - * we output the non-space character itself! This little loop is - * interesting because it solves the problem of leftover spaces - * _and_ gets the 'spaces' back to zero, which it needs to be once - * we hit a non-space character. + /* Be sure to output any leftover spaces when we come across a + * non-space character. This should allow for spaces between words + * that don't fall along the tabstop lines. */ - while (spaces != 0) { + + while (spaces > 0) { putchar(' '); - --spaces; + spaces--; } - // Output the non-space character. + + // As usual, reset things on a newline. + if (c == '\n') { + column = 0; + spaces = 0; + } + + // Now we can output whatever it is. putchar(c); } } -- cgit v1.2.3-70-g09d2 ' type='search' size='10' name='q' value=''/>
path: root/ch1/1-04_celsius_converter.c (unfollow)
tions'>-3/+23Remove ID field from DB
AgeCommit message (Collapse)AuthorFilesLines
2016-10-24Correct run_again, add recursionZe Libertine Gamer1-0/+4
2016-10-21Add quotes to correct behavior for arglistZe Libertine Gamer1-1/+1
2016-10-14updater.sh: add recursion, error handlingZe Libertine Gamer1-43/+101
2016-10-14Correct pipe-handling behaviorZe Libertine Gamer1-1/+9
2016-10-12Clarify a method to move between platformsZe Libertine Gamer1-2/+5
zlg3-38/+46
The sqlite database already uses a game's title and system as the primary keys. Row IDs are redundant.
2018-10-06cli: change "Status" heading to "Progress"zlg2-36/+40
2018-09-29Bump to 0.3alpha5 for PyPIzlg1-1/+1
2018-09-29cli: Add pretty printing to 'list' commandzlg3-17/+107
Also add the "--width" option to specify the maximum width of the table.
2018-09-08setup.py: Bump to alpha4 for PyPIzlg1-1/+1
2018-09-08cli: add '--raw' option to list commandzlg2-9/+45
Add '--raw' option to the list command, in addition to proper note expansion. Newline characters in notes are escaped to be friendly to scripting. This option may be shortened to '-r' at the user's convenience. In raw output mode, the information is formatted in plain pipe-delimited strings, one line per row: title|system|ownership|progress|notes ownership and progress are printed in their numeric form, consistent with the OWNERSHIP and PROGRESS dictionaries in the vgstash package. An empty notes field will result in a line ending with a pipe and no whitespace following it.
2018-09-08Add remaining filters to vgstash packagezlg1-2/+11
2018-09-04Update LICENSE to match setup.pyzlg1-80/+67
Whoops.
2018-09-03Branch off from master with pytest, tox, clickzlg16-778/+779
This commit is huge, but contains everything needed for a "proper" build system built on pytest + tox and a CLI built with click. For now, this branch will contain all new vgstash development activity until it reaches feature parity with master. The CLI is installed to pip's PATH. Only the 'init', 'add', and 'list' commands work, with only two filters. This is pre-alpha software, and is therefore not stable yet.
2018-03-18Flesh out filter types and ownership statuszlg3-82/+144
It's time for a refactor to a module; the functionality and interface are clashing.
2018-03-18README.mdown: break line correctlyzlg1-1/+1
2018-03-18add 'playlog' list filterzlg2-2/+9
This filter is used to get an idea of which games you're currently playing through, so you can prioritize games to play when you're bored and detect it when you've beaten a game but haven't marked it as such.
2018-03-13Update helpers a bitzlg1-2/+9
At present, user modification is needed to make these seamless. vgup() may need to be axed in favor of telling the user to make an alias.
2018-03-13Make VGSTASH_DB_LOCATION point to a filezlg2-21/+20
It used to point to a directory, which would then look for .vgstash.db. This behavior was kind of backwards and I don't remember why I did it that way. This change gives users more control over where they put their DB. Be sure to update your environment variable if you have it set!
2016-11-18Remove settings from helpers.shZe Libertine Gamer1-5/+0
Sourcing them in .bash_profile screws up login if they're set.
2016-11-15Correct phrasing in README.Ze Libertine Gamer1-4/+4
2016-11-13DerpZe Libertine Gamer1-0/+1
2016-11-03Improve error handling in shell scriptsZe Libertine Gamer4-3/+23
2016-10-24Correct run_again, add recursionZe Libertine Gamer1-0/+4
Loops and functions -- oh my, what a useful combination. :)
2016-10-21Add quotes to correct behavior for arglistZe Libertine Gamer1-1/+1
2016-10-14updater.sh: add recursion, error handlingZe Libertine Gamer1-43/+101
2016-10-14Correct pipe-handling behaviorZe Libertine Gamer1-1/+9
2016-10-12Clarify a method to move between platformsZe Libertine Gamer1-2/+5
Also correct a typo.