Fix things

watamario15 · Jul 5, 2023 · a8a541c · a8a541c
1 parent 9004bb9
commit a8a541c
Show file tree

Hide file tree

Showing 16 changed files with 261 additions and 298 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,2 @@
+BasedOnStyle: Google
+ColumnLimit: 120
diff --git a/bf.cpp b/bf.cpp
@@ -70,8 +70,7 @@ enum Brainfuck::result_t Brainfuck::next(unsigned char *output, bool *didOutput)
         ++memIndex;
         if (memIndex == memLen) ++memLen;
       } else {
-        wsprintfW(lastError, L"%u: Instruction '>' used when the memory pointer is 65535.",
-                  progIndex);
+        wsprintfW(lastError, L"%u: Instruction '>' used when the memory pointer is 65535.", progIndex);
         return RESULT_ERR;
       }
       break;
@@ -93,16 +92,14 @@ enum Brainfuck::result_t Brainfuck::next(unsigned char *output, bool *didOutput)
         if (memory[memIndex] != 0x7F) {
           ++memory[memIndex];
         } else {
-          wsprintfW(lastError, L"%u: Instruction '+' used when the pointed memory is 127.",
-                    progIndex);
+          wsprintfW(lastError, L"%u: Instruction '+' used when the pointed memory is 127.", progIndex);
           return RESULT_ERR;
         }
       } else {
         if (memory[memIndex] != 0xFF) {
           ++memory[memIndex];
         } else {
-          wsprintfW(lastError, L"%u: Instruction '+' used when the pointed memory is 255.",
-                    progIndex);
+          wsprintfW(lastError, L"%u: Instruction '+' used when the pointed memory is 255.", progIndex);
           return RESULT_ERR;
         }
       }
@@ -116,16 +113,14 @@ enum Brainfuck::result_t Brainfuck::next(unsigned char *output, bool *didOutput)
         if (memory[memIndex] != 0x80) {
           --memory[memIndex];
         } else {
-          wsprintfW(lastError, L"%u: Instruction '-' used when the pointed memory is -128.",
-                    progIndex);
+          wsprintfW(lastError, L"%u: Instruction '-' used when the pointed memory is -128.", progIndex);
           return RESULT_ERR;
         }
       } else {
         if (memory[memIndex] != 0x00) {
           --memory[memIndex];
         } else {
-          wsprintfW(lastError, L"%u: Instruction '-' used when the pointed memory is 0.",
-                    progIndex);
+          wsprintfW(lastError, L"%u: Instruction '-' used when the pointed memory is 0.", progIndex);
           return RESULT_ERR;
         }
       }
@@ -143,8 +138,7 @@ enum Brainfuck::result_t Brainfuck::next(unsigned char *output, bool *didOutput)
         } else if (noInput == NOINPUT_FF) {
           memory[memIndex] = 255;
         } else {
-          wsprintfW(lastError, L"%u: Instruction ',' used when the input stream is empty.",
-                    progIndex);
+          wsprintfW(lastError, L"%u: Instruction ',' used when the input stream is empty.", progIndex);
           return RESULT_ERR;
         }
       } else {

diff --git a/bf.hpp b/bf.hpp
@@ -16,28 +16,15 @@ class Brainfuck {
 
   // Initializes the internal state.
   Brainfuck()
-      : program(NULL),
-        input(NULL),
-        memLen(1),
-        wrapInt(true),
-        signedness(true),
-        debug(false),
-        noInput(NOINPUT_ZERO) {
+      : program(NULL), input(NULL), memLen(1), wrapInt(true), signedness(true), debug(false), noInput(NOINPUT_ZERO) {
     reset();
   }
 
   // Initializes the internal state and registers a program and an input.
   // You must call reset() whenever you want to modify the program and the input.
-  // Pass a program and an input as dedicated malloc()-ed data and don't free() them. This module
-  // takes care of it.
+  // Pass a program and an input as dedicated malloc()-ed data and don't free() them. This module takes care of it.
   Brainfuck(unsigned progLen, wchar_t *program, unsigned inLen, void *input)
-      : program(NULL),
-        input(NULL),
-        memLen(1),
-        wrapInt(true),
-        signedness(true),
-        debug(false),
-        noInput(NOINPUT_ZERO) {
+      : program(NULL), input(NULL), memLen(1), wrapInt(true), signedness(true), debug(false), noInput(NOINPUT_ZERO) {
     reset(progLen, program, inLen, input);
   }
 
@@ -51,22 +38,20 @@ class Brainfuck {
 
   // Resets the internal state and registers a program and an input.
   // You must call reset() whenever you want to modify the program and the input.
-  // Pass a program and an input as dedicated malloc()-ed data and don't free() them. This module
-  // takes care of it.
+  // Pass a program and an input as dedicated malloc()-ed data and don't free() them. This module takes care of it.
   void reset(unsigned progLen, wchar_t *program, unsigned inLen, void *input);
 
   // Change implementation-defined behaviors.
   // If wrapInt is false, next() throws an exception when overflowed or underflowed.
   // If wrapInt is true, signedness doen't have any effect.
   // If debug is true, breakpoint instruction ("@") is enabled.
-  // The default behavior is [zero for no input, wrap around integer, signed integer (no effects in
-  // this case), no debug].
-  void setBehavior(enum noinput_t noInput = NOINPUT_ZERO, bool wrapInt = true,
-                   bool signedness = true, bool debug = false);
+  // The default behavior is [zero for no input, wrap around integer, signed integer (no effects in this case), no
+  // debug].
+  void setBehavior(enum noinput_t noInput = NOINPUT_ZERO, bool wrapInt = true, bool signedness = true,
+                   bool debug = false);
 
   // Executes the next code, and writes its output on `output` if any.
-  // Returns the result of an execution, which is running, breakpoint, finished, and
-  // error.
+  // Returns the result of an execution, which is running, breakpoint, finished, and error.
   enum result_t next(unsigned char *output, bool *didOutput);
 
   // Returns the memory and writes its size to `size`.

diff --git a/brain.sh b/brain.sh
diff --git a/history.cpp b/history.cpp
@@ -74,7 +74,7 @@ void History::add() {
 }
 
 void History::undo() {
- if (canUndo()) {
+  if (canUndo()) {
     DWORD selEnd;
     --historyIndex;
     SendMessageW(hEditor, EM_GETSEL, (WPARAM)NULL, (LPARAM)&selEnd);

diff --git a/main.hpp b/main.hpp
@@ -28,9 +28,9 @@
 #include <string>
 
 #include "bf.hpp"
+#include "history.hpp"
 #include "resource.h"
 #include "util.hpp"
-#include "history.hpp"
 
 // Workaround for wrong macro definitions in CeGCC.
 #ifdef UNDER_CE
@@ -71,8 +71,8 @@ typedef enum MONITOR_DPI_TYPE {
 } MONITOR_DPI_TYPE;
 
 // The function pointer type for GetDpiForMonitor API.
-typedef HRESULT(CALLBACK *GetDpiForMonitor_t)(HMONITOR hmonitor, MONITOR_DPI_TYPE dpiType,
-                                              unsigned *dpiX, unsigned *dpiY);
+typedef HRESULT(CALLBACK *GetDpiForMonitor_t)(HMONITOR hmonitor, MONITOR_DPI_TYPE dpiType, unsigned *dpiX,
+                                              unsigned *dpiY);
 #endif
 
 // Making SetWindowLongW and GetWindowLongW compatible for both 32-bit and 64-bit system.
@@ -91,8 +91,7 @@ typedef HRESULT(CALLBACK *GetDpiForMonitor_t)(HMONITOR hmonitor, MONITOR_DPI_TYP
 #endif
 
 #ifndef WS_OVERLAPPEDWINDOW
-#define WS_OVERLAPPEDWINDOW \
-  WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX
+#define WS_OVERLAPPEDWINDOW WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX
 #endif
 #define WM_APP_THREADEND WM_APP