Refactoring everything.

Almost done with it! Just gotta get links and images working.
master
Reese 2 years ago
parent 6a694b3a84
commit c0350465ba

@ -34,6 +34,15 @@
#define VERSION "0.43" /* yes i pulled a number out of my hat please cope */
#define checkCloseAndPrint(thing,openTxt,closeTxt) \
if (close.thing) { \
fputs(closeTxt,stdout); \
close.thing = 0; \
} else { \
fputs(openTxt,stdout); \
close.thing = 1; \
}
typedef struct {
size_t position;
size_t size;
@ -57,17 +66,34 @@ void reallocBuffer(Buffer *buffer) {
}
}
void appendToBuffer(Buffer *buffer, Buffer *dataBuffer) {
void appendBufferToBuffer(Buffer *buffer, Buffer *dataBuffer) {
for (size_t i = 0;i < dataBuffer->size;i++) {
if (dataBuffer->data[i] == 0x00) break; /* stop on NULL */
buffer->data[buffer->position] = dataBuffer->data[i];
buffer->position++;
if ((buffer->position > buffer->size-64) || (buffer->size-64 > buffer->position)) {
if ((buffer->position > buffer->size-64) || (buffer->size-64 < 0)) {
reallocBuffer(buffer);
}
}
}
void appendCharPToBuffer(char *string, Buffer *buffer) {
size_t stringLen = strlen(string);
for (size_t i = 0;i < stringLen;i++) {
buffer->data[buffer->position+i] = string[i];
buffer->position++;
}
}
void appendCharToBuffer(char character, Buffer *buffer) {
buffer->data[buffer->position] = character;
buffer->position++;
if ((buffer->position > buffer->size-64) || (buffer->size-64 < 0)) {
reallocBuffer(buffer);
}
}
int main(int argc, char **argv) {
(void)argv; /* this stops it from yelling at me :) */
@ -86,14 +112,8 @@ int main(int argc, char **argv) {
exit(1);
}
Buffer buffer;
buffer.size = 1024; /* initial size of the main output buffer */
buffer.data = calloc(buffer.size,sizeof(char));
buffer.position = 0;
char character = 'a';
int characterInt = 'a';
bool skipChar = false;
struct closeThings close;
@ -102,111 +122,42 @@ int main(int argc, char **argv) {
characterInt = fgetc(stdin);
character = (char)characterInt;
if (buffer.position > buffer.size-64) {
reallocBuffer(&buffer);
}
if (skipChar) {
skipChar = false;
buffer.data[buffer.position] = character;
buffer.position++;
} else if (character == '\\') { /* character escaping */
skipChar = true;
} else if (character == '*') { /* bold */
if (close.Bold) {
appendToBuffer(&buffer,&(Buffer){0,4,"</b>"});
close.Bold = false;
} else {
appendToBuffer(&buffer,&(Buffer){0,3,"<b>"});
close.Bold = true;
}
} else if (character == '/') { /* italics */
if (close.Italics) {
appendToBuffer(&buffer,&(Buffer){0,4,"</i>"});
close.Italics = false;
} else {
appendToBuffer(&buffer,&(Buffer){0,3,"<i>"});
close.Italics = true;
}
} else if (character == '`') { /* monospace */
if (close.Monospace) {
appendToBuffer(&buffer,&(Buffer){0,7,"</code>"});
close.Monospace = false;
} else {
appendToBuffer(&buffer,&(Buffer){0,6,"<code>"});
close.Monospace = true;
}
} else if (character == '~') { /* strikethrough */
if (close.Strikethrough) {
appendToBuffer(&buffer,&(Buffer){0,6,"</del>"});
close.Strikethrough = false;
} else {
appendToBuffer(&buffer,&(Buffer){0,5,"<del>"});
close.Strikethrough = true;
}
} else if (character == '_') { /* underlined */
if (close.Underline) {
appendToBuffer(&buffer,&(Buffer){0,6,"</ins>"});
close.Underline = false;
} else {
appendToBuffer(&buffer,&(Buffer){0,5,"<ins>"});
close.Underline = true;
}
} else if (character == '[') { /* markdown style links */
Buffer linkTxt = {0,256,calloc(256,sizeof(char))};
Buffer linkLoc = {0,256,calloc(256,sizeof(char))};
Buffer linkOut = {0,256,calloc(256,sizeof(char))};
appendToBuffer(&linkOut,&(Buffer){0,10,"<a href=\""});
while (character != 0x00) {
character = (char)fgetc(stdin);
if (character == ']') break;
linkTxt.data[linkTxt.position] = character;
linkTxt.position++;
if (linkTxt.position > linkTxt.size-64) {
reallocBuffer(&linkTxt);
}
}
character = (char)fgetc(stdin); /* this remove the '(' */
while (character != 0x00) {
character = (char)fgetc(stdin);
if (character == ')') break;
linkLoc.data[linkLoc.position] = character;
linkLoc.position++;
if (linkLoc.position > linkLoc.size-64) {
reallocBuffer(&linkLoc);
}
}
appendToBuffer(&linkOut,&linkLoc);
appendToBuffer(&linkOut,&(Buffer){0,2,"\">"});
appendToBuffer(&linkOut,&linkTxt);
appendToBuffer(&linkOut,&(Buffer){0,4,"</a>"});
appendToBuffer(&buffer,&linkOut);
free(linkOut.data);
free(linkTxt.data);
free(linkLoc.data);
} else if (character == '\n') { /* convert newlines */
appendToBuffer(&buffer,&(Buffer){0,5,"<br>\n"});
} else { /* it is a normal character append to buffer */
buffer.data[buffer.position] = character;
buffer.position++;
}
switch (character) {
case '\\': /* character escaping */
putc((char)fgetc(stdin),stdout);
break;
case '*': /* bold */
checkCloseAndPrint(Bold,"<b>","</b>");
break;
case '/': /* italics */
checkCloseAndPrint(Bold,"<i>","</i>");
break;
case '`': /* monospace */
checkCloseAndPrint(Bold,"<code>","</code>");
break;
case '~': /* strikethrough */
checkCloseAndPrint(Bold,"<del>","</del>");
break;
case '_': /* underline */
checkCloseAndPrint(Bold,"<ins>","</ins>");
break;
case '[':
break;
case '{': /* images */
break;
case '\n': /* convert newlines */
puts("<br>");
break;
default: /* it is a normal character append to buffer */
putc(character,stdout);
break;
}
}
for (size_t i = 0;i < buffer.position-1;i++) {
printf("%c",buffer.data[i]);
}
free(buffer.data);
return 0;
}

Loading…
Cancel
Save