From e1f1f662dfcb39a6cb327608896dbb6424d2cb51 Mon Sep 17 00:00:00 2001
From: Shawn Quick <quick@marketideas.com>
Date: Mon, 17 Jan 2022 11:21:57 -0800
Subject: [PATCH] libpal updates

---
 CMakeLists.txt           |  2 +-
 asm.cpp                  |  3 ++-
 config.h                 |  3 +--
 psuedo.h                 | 56 ++++++++++++++++++++--------------------
 qasm.cpp                 |  2 ++
 qasm.h                   |  2 ++
 testdata/3002-testfile.S |  3 +--
 7 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4415f58..d28b83b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ set(SOURCE
 )
 
 #find_package(OpenSSL REQUIRED)
-find_package( Poco REQUIRED Foundation Util XML JSON )
+find_package( Poco REQUIRED Foundation Util XML JSON Net )
 
 if ( ${CIDER} )
 find_package( ZLIB )
diff --git a/asm.cpp b/asm.cpp
index 6dc0de5..83758bb 100644
--- a/asm.cpp
+++ b/asm.cpp
@@ -78,7 +78,8 @@ void CLASS::print(uint32_t lineno)
 		nc = nc1;
 	}
 
-	if ((!isatty(STDOUT_FILENO)) || (merlinerrors))
+	//if ((!isatty(STDOUT_FILENO)) || (merlinerrors))
+	if ((!isatty(STDOUT_FILENO)) || (0))
 	{
 		nc = true;
 	}
diff --git a/config.h b/config.h
index 7d8623b..0725706 100644
--- a/config.h
+++ b/config.h
@@ -6,9 +6,8 @@
 #define NO_SIGNAL_HANDLING
 
 //#define SERVERAPP
-
 //#define ENABLE_SSL
-//#define USE_LOGGER
+#define USE_LOGGER
 //#define USE_NET
 //#define USE_SSL
 //#define USE_JSON
diff --git a/psuedo.h b/psuedo.h
index 87e7a27..945489c 100644
--- a/psuedo.h
+++ b/psuedo.h
@@ -5,47 +5,47 @@
 
 enum
 {
-	P_ORG = 1,
-	P_LST,
-	P_SAV,
-	P_DUM,
-	P_DEND,
-	P_DS,
-	P_PUT,
-	P_USE,
-	P_HEX,
-	P_DATA,
-	P_LUP,
-	P_DO,
-	P_TR,
+    P_ORG = 1,
+    P_LST,
+    P_SAV,
+    P_DUM,
+    P_DEND,
+    P_DS,
+    P_PUT,
+    P_USE,
+    P_HEX,
+    P_DATA,
+    P_LUP,
+    P_DO,
+    P_TR,
     P_ASC,
     P_ERR,
     P_MAC,
     P_CAS,
     P_USR,
 
-	P_MAX
+    P_MAX
 };
 
 class CLASS
 {
 public:
-	CLASS();
-	~CLASS();
-	uint32_t doShift(uint32_t value, uint8_t shift);
+    CLASS();
+    ~CLASS();
+    uint32_t doShift(uint32_t value, uint8_t shift);
 
-	int ProcessOpcode(T65816Asm  &a, MerlinLine &line, TSymbol &opinfo);
-	int doLST(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
-	int doDUM(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
-	int doDS(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
-	int doHEX(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
-	int doDATA(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
-	int doLUP(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
-	int doDO(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
-	int doTR(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
+    int ProcessOpcode(T65816Asm  &a, MerlinLine &line, TSymbol &opinfo);
+    int doLST(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
+    int doDUM(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
+    int doDS(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
+    int doHEX(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
+    int doDATA(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
+    int doLUP(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
+    int doDO(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
+    int doTR(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
     int doASC(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
-	int doMAC(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
-	int doUSR(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
+    int doMAC(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
+    int doUSR(T65816Asm &a, MerlinLine &line, TSymbol &opinfo);
 
 };
 
diff --git a/qasm.cpp b/qasm.cpp
index c065ecd..98cd95b 100644
--- a/qasm.cpp
+++ b/qasm.cpp
@@ -45,6 +45,7 @@ void CLASS::displayVersion()
 
 }
 
+#ifdef SERVERAPP
 int CLASS::runServerApp(PAL_EVENTMANAGER *em)
 {
 	int res = -1;
@@ -63,6 +64,7 @@ int CLASS::runServerApp(PAL_EVENTMANAGER *em)
 	}
 	return (res);
 }
+#endif
 
 void CLASS::showerror(int ecode, std::string fname)
 {
diff --git a/qasm.h b/qasm.h
index a9e0002..752cf2b 100644
--- a/qasm.h
+++ b/qasm.h
@@ -19,7 +19,9 @@ class CLASS : public PAL_BASEAPP
 protected:
 	void showerror(int ecode,std::string fname);
 	virtual int runCommandLineApp(void);
+#ifdef SERVERAPP
 	virtual int runServerApp(PAL_EVENTMANAGER *em);
+#endif
 	virtual void displayVersion();
 
 public:
diff --git a/testdata/3002-testfile.S b/testdata/3002-testfile.S
index 725dbbf..d368bde 100644
--- a/testdata/3002-testfile.S
+++ b/testdata/3002-testfile.S
@@ -1,4 +1,4 @@
-                              ;lst off
+            lst off
             xc    off         
             xc                
             xc                
@@ -15,7 +15,6 @@ immed       =     $123456
 neg         equ   -16         
 
 *]var1 		= v1234
-
                               ;lst off
 start00                      
             brk               ;$00