Skip to content

Commit

Permalink
Fix all whitespace errors
Browse files Browse the repository at this point in the history
Now nobody's commit should be flagged by Travis unless it actually
introduces whitespace errors (which we do want to check for).

This doesn't fully sort out indentation everywhere, but does fix all
whitespace that Git doesn't like. You can check the whitespace across
the entire codebase with:

    git diff-tree --check "$(git hash-object -t tree /dev/null)" HEAD
  • Loading branch information
AbigailBuccaneer committed Feb 2, 2018
1 parent b218ccb commit 9ae1f55
Show file tree
Hide file tree
Showing 342 changed files with 1,783 additions and 1,796 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Expand Up @@ -14,4 +14,4 @@
*.vvd binary
*.wav binary

* text=auto
* text=auto
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -24,7 +24,7 @@ install:
- luarocks list --outdated --porcelain | awk '{ print $1, $3 }' | xargs --no-run-if-empty -n 2 luarocks install

script:
- git -c core.whitespace=-blank-at-eol,-blank-at-eof,-space-before-tab diff --check $TRAVIS_COMMIT_RANGE
- git diff --check $TRAVIS_COMMIT_RANGE
- git diff --name-only $TRAVIS_COMMIT_RANGE | grep '\.lua$' | grep -v '^lua/entities/gmod_wire_expression2/core/' | xargs --no-run-if-empty luacheck
- luacheck .luacheckrc

Expand Down
2 changes: 1 addition & 1 deletion data/adv_duplicator/wireman.txt
Expand Up @@ -62,4 +62,4 @@ Constraints:1A790460{Y:31=N:242;Y:32=N:0;}1926A480{Y:33=T:18FACDC8;Y:35=Y:34;}1B
39:"Weld"
40:"Keepupright"
41:"angularlimit"
Saved:291
Saved:291
4 changes: 2 additions & 2 deletions data/cpuchip/examples/helloworld.txt
@@ -1,7 +1,7 @@
//Wired Hello World!
//Connect CPU membus input to console screen
//Connect CPUs CLK input to button (toggle)
//Notice how you can store your
//Notice how you can store your
//subroutines/calls in DATA area
jmp _code;
message:
Expand All @@ -26,7 +26,7 @@ _code:
call WriteString;

//More about colors:
//Lower 3 digits are foreground,
//Lower 3 digits are foreground,
//and higher 3 digits are background
//Each of 3 digits shows amount of
//RED, GREEN, and BLUE (in order)
Expand Down
6 changes: 3 additions & 3 deletions data/cpuchip/examples/udh_test.txt
Expand Up @@ -10,7 +10,7 @@
void main() {
float i;
udhSetBusAddress(65536);

cscrInitialize(0);

udhQueryDevices();
Expand All @@ -19,10 +19,10 @@ void main() {
cscrSelect(i);
cscrSetActive(1);
cscrClear();

cscrSetCursor(0,0);
cscrPrintLine("Screen ",930);
cscrPrintNumber(i,930);
cscrPrintNumber(i,930);
}

cscrSelect(0);
Expand Down
34 changes: 17 additions & 17 deletions data/cpuchip/lib/drivers/drv_cscr.txt
Expand Up @@ -37,7 +37,7 @@ float cscrSelectedScreen;
//Update console screen offsets
void cscrUDHQueryFunction() {
float i,n;
n = udhGetDevices(11,MAX_CONSOLE_SCREENS,cscrDevices);
n = udhGetDevices(11,MAX_CONSOLE_SCREENS,cscrDevices);
for (i = 0; i < n; i++) {
cscrOffsets[i] = udhGetDeviceOffset(cscrDevices[i]);
}
Expand Down Expand Up @@ -83,20 +83,20 @@ void cscrClear() {
}

void cscrSetBackground(float col) {
if (!cscrOffsets[cscrSelectedScreen]) return;
if (!cscrOffsets[cscrSelectedScreen]) return;
*(cscrOffsets[cscrSelectedScreen]+BACKGROUND_COLOR) = col;
}

void cscrSetRotation(float rot) {
*(cscrOffsets[cscrSelectedScreen]+SCREEN_ROTATION) = rot;
*(cscrOffsets[cscrSelectedScreen]+SCREEN_ROTATION) = rot;
}

void cscrSetBrightness(float bright) {
*(cscrOffsets[cscrSelectedScreen]+SCREEN_BRIGHTNESS) = bright;
}

void cscrLoadImage(char* imgdata) {
if (!cscrOffsets[cscrSelectedScreen]) return;
if (!cscrOffsets[cscrSelectedScreen]) return;

preserve ESI,EDI;
ESI = imgdata;
Expand All @@ -105,7 +105,7 @@ void cscrLoadImage(char* imgdata) {
}

void cscrPutLine(char* scrptr, float col, char* str) {
if (!cscrOffsets[cscrSelectedScreen]) return;
if (!cscrOffsets[cscrSelectedScreen]) return;
char* curptr = scrptr;

while (*str) {
Expand All @@ -118,7 +118,7 @@ void cscrPutLine(char* scrptr, float col, char* str) {
}

void cscrPutChar(char* scrptr, float col, char ch) {
if (!cscrOffsets[cscrSelectedScreen]) return;
if (!cscrOffsets[cscrSelectedScreen]) return;

*(cscrOffsets[cscrSelectedScreen]+scrptr*2+0) = ch;
*(cscrOffsets[cscrSelectedScreen]+scrptr*2+1) = col;
Expand Down Expand Up @@ -146,26 +146,26 @@ void cscrPrintLine(char* str, float col) {
str++;
if (*str == 0) return;
}

*(cscrOffsets[cscrSelectedScreen]+cscrCharacterPointer[cscrSelectedScreen]*2+0) = *str;
*(cscrOffsets[cscrSelectedScreen]+cscrCharacterPointer[cscrSelectedScreen]*2+1) = col;
cscrCharacterPointer[cscrSelectedScreen]++;
if (cscrCharacterPointer[cscrSelectedScreen] >= 30*18) cscrNewLine();

cscrCharacterPointer[cscrSelectedScreen]++;
if (cscrCharacterPointer[cscrSelectedScreen] >= 30*18) cscrNewLine();
str++;
}
}

void cscrPrintNumber(float num, float col) {
if (!cscrOffsets[cscrSelectedScreen]) return;

float ndig,a;
a = num;
ndig = 0;
while (a > 0) {
ndig++;
a /= 10;
fint a;
fint a;
}
max ndig,1;
a = num;
Expand All @@ -177,19 +177,19 @@ void cscrPrintNumber(float num, float col) {
mov EDX,a;
mod EDX,10;
add EDX,48;

*(cscrOffsets[cscrSelectedScreen]+charPtr*2+0) = EDX;
*(cscrOffsets[cscrSelectedScreen]+charPtr*2+1) = col;
charPtr--;

a /= 10;
fint a;

ndig--;
}
}

void cscrSetCursor(float x, y) {
if (!cscrOffsets[cscrSelectedScreen]) return;
if (!cscrOffsets[cscrSelectedScreen]) return;
cscrCharacterPointer[cscrSelectedScreen] = x+y*30;
}
}
14 changes: 7 additions & 7 deletions data/cpuchip/lib/drivers/drv_udh.txt
Expand Up @@ -37,7 +37,7 @@ string udhDeviceString17,"Sound emitter";
string udhDeviceString18,"Constant value";
string udhDeviceString19,"Data port";
string udhDeviceString20,"RAM";
udhDeviceName:
udhDeviceName:
db udhDeviceString0, udhDeviceString1, udhDeviceString2;
db udhDeviceString3, udhDeviceString4, udhDeviceString5;
db udhDeviceString6, udhDeviceString7, udhDeviceString8;
Expand All @@ -63,7 +63,7 @@ void udhQueryDevices() {

//Run the query
udhBusOffset[16] = 32+MAX_UDH_DEVICES;
udhBusOffset[17] = 1;
udhBusOffset[17] = 1;

//Reconfigure all devices
//FIXME: only supports single extended bus right now
Expand Down Expand Up @@ -95,7 +95,7 @@ float udhGetDeviceOffset(float busIndex) {
char* udhGetDeviceName(float busIndex) {
float deviceType = udhGetDeviceType(busIndex);
if ((deviceType >= 0) && (deviceType <= 20)) {
return udhDeviceName[deviceType];
return udhDeviceName[deviceType];
} else {
return udhDeviceName[1];
}
Expand All @@ -107,20 +107,20 @@ void udhSetDeviceOffsetSize(float busIndex, char* offst, char* size) {
}

float udhGetNumDevices() {
return MAX_UDH_DEVICES;
return MAX_UDH_DEVICES;
}

float udhGetDevices(float type, float maxCount, char* deviceList) {
float i,devPtr,n;

devPtr = deviceList;
n = 0;
for (i = 0; i < MAX_UDH_DEVICES; i++) {
if ((udhGetDeviceType(i) == type) && (n < maxCount)) {
n++;
*devPtr++ = i;
*devPtr++ = i;
}
}

return n;
}
}
6 changes: 3 additions & 3 deletions data/cpuchip/lib/zcrt/ctype.txt
Expand Up @@ -21,7 +21,7 @@ float isalnum(char c) {
preserve eax;
eax = c; max eax,0; min eax,_MAXCHARS;
eax = __ctype_characters[eax];

band eax,_LOWER+_UPPER+_DIGIT;
}

Expand Down Expand Up @@ -265,8 +265,8 @@ __ctype_characters:
db _PUNCT; //7D }
db _PUNCT; //7E ~
db _CONTROL; //7F (DEL)

db _GRAPH; //80
db _GRAPH; //81
db _GRAPH; //82
db _GRAPH; //83
db _GRAPH; //83
2 changes: 1 addition & 1 deletion data/cpuchip/lib/zcrt/init.txt
Expand Up @@ -34,7 +34,7 @@ int 1;
#ifdef ZCRT_EXTENDED_MODE
float zcrtInterruptTable[1024];
char* zcrtInterruptEntrypoint;

// Default interrupt handlers
zcrtErrorHandler:
//Execute handler if required
Expand Down
16 changes: 8 additions & 8 deletions data/cpuchip/lib/zcrt/string.txt
Expand Up @@ -10,7 +10,7 @@
void *memcpy(void *dest, void *src, float n) {
preserve esi,edi;
register float rem;

esi = src;
edi = dest;
rem = n;
Expand Down Expand Up @@ -64,7 +64,7 @@ void* memset(void *ptr, float c, float n) {
//appends the string src to dest
char* strcat(char *src, *dest) {
register char *srcptr, *destptr;

srcptr = src;
while (*++srcptr) ;

Expand All @@ -77,7 +77,7 @@ char* strcat(char *src, *dest) {
char* strncat(char *src, *dest, float n) {
register char *srcptr, *destptr;
register float i;

srcptr = src;
srcptr--;
while (*++srcptr) ;
Expand Down Expand Up @@ -107,7 +107,7 @@ char* strchr(char *str, c) {
char* strrchr(char *str, c) {
register char *strptr, ch;
register char *findptr;

findptr = 0;
strptr = str;
ch = c;
Expand Down Expand Up @@ -135,7 +135,7 @@ float strcmp(char *src, *dest) {
float strncmp(char *src, *dest, float n) {
register char *srcptr, *destptr;
register float i;

srcptr = src;
destptr = dest;
i = n;
Expand Down Expand Up @@ -167,7 +167,7 @@ char* strncpy(char *dest, *src, float n) {
destptr = dest;
srcptr = src;
i = n;

while (i-- > 0) {
if (*destptr++ = *srcptr++) continue;
while (i-- > 0) *destptr++ = 0;
Expand All @@ -183,7 +183,7 @@ char* strncpy(char *dest, *src, float n) {
float strlen(char* str) {
register char* strptr;
register float n;

strptr = str;
n = 0;
while (*strptr++) n++;
Expand All @@ -207,7 +207,7 @@ float strspn(char *str, *accept) {
//determines the length of the maximal initial substring consisting entirely of characters not in reject
float strcspn(char *str, char *reject) {
register char *s, *p;

for (s=str; *s; s++) {
for (p=reject; *p; p++) {
if (*p == *s) goto done;
Expand Down
2 changes: 1 addition & 1 deletion data/expression2/_helloworld_.txt
Expand Up @@ -21,4 +21,4 @@ if(A > B) {

Vector = vec(A, B, 0)
Vector = Vector + vec(0, 0, A + B)
Vector = Vector:normalized()
Vector = Vector:normalized()
18 changes: 9 additions & 9 deletions data/gpuchip/examples/3d_cube.txt
Expand Up @@ -8,18 +8,18 @@ Main();
void Main()
{
glClear( 0, 0, 0 ); // Clear screen
glCoordPipe( GL_CPIPE_N1_1 ); // Set coordinate pipe to [-1 to 1] mode

glCoordPipe( GL_CPIPE_N1_1 ); // Set coordinate pipe to [-1 to 1] mode
glVertexPipe( GL_VPIPE_XYZTRANSFORM ); // Set vertex pipe to xyz transformation

glLightPos( 0, 0, -20 ); // Set the light position
glLightColor( 255, 255, 255, 1 ); // Set the light color

glLookAt(
0, 0, -5, // Camera pos
0, 0, 0, // Camera target
0, 1, 0 // Camera up
);
);

// Create variable to hold curtime
float time;
Expand All @@ -31,22 +31,22 @@ void Main()
glTranslate( 0, 0, 0 ); // TRANSLATION X, Y, Z
glScale( 1, 1, 1 ); // SCALE X, Y, Z

glEnable( GL_VERTEX_BUFFER ); // Enable vertex buffer
glEnable( GL_VERTEX_BUFFER ); // Enable vertex buffer
glEnable( GL_VERTEX_ZSORT ); // Enable Z sorting

// Solid 3D polygon
glFillMode( GL_FILL_SOLID ); // Set fillmode as solid
glColor4( 100, 149, 237, 180 ); // Set draw color with alpha
glPoly3D( vertexBuffer, 12 ); // Draw 3D polygon
glPoly3D( vertexBuffer, 12 ); // Draw 3D polygon
glFlush(); // Flush the vertex buffer to the screen

// Wireframe 3D polygon
glLineWidth( 1 ); // Set line width
glFillMode( GL_FILL_WIREFRAME ); // Set fillmode as solid
glColor4( 255, 255, 255, 255 ); // Set draw color with alpha
glPoly3D( vertexBuffer, 12 ); // Draw 3D polygon
glPoly3D( vertexBuffer, 12 ); // Draw 3D polygon
glFlush(); // Flush the vertex buffer to the screen

glExit(); // Exit
}

Expand Down

0 comments on commit 9ae1f55

Please sign in to comment.