From 0502658768df6c56c56f299ea86710cb7d711714 Mon Sep 17 00:00:00 2001
From: mike <mike@eduroam-169-233-213-38.ucsc.edu>
Date: Thu, 28 Jan 2016 18:23:12 -0800
Subject: [PATCH 01/14] Added comments for lineNumber targets

---
 include/hx/Debug.h |  2 ++
 src/hx/Debug.cpp   | 75 +++++++++++++++++++++++-----------------------
 2 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/include/hx/Debug.h b/include/hx/Debug.h
index 1a9e2bcc7..93753a65e 100644
--- a/include/hx/Debug.h
+++ b/include/hx/Debug.h
@@ -105,6 +105,7 @@ class StackFrame
 
     // The constructor automatically adds the StackFrame to the list of
     // stack frames for the current thread
+    //cs116 - modify to take column numbers
     inline StackFrame(const char *inClassName, const char *inFunctionName,
                #ifdef HXCPP_DEBUG_HASHES
                int inClassFunctionHash,
@@ -157,6 +158,7 @@ class StackFrame
 
     // Current line number, changes during the lifetime of the stack frame.
     // Only updated if HXCPP_STACK_LINE is defined.
+    //cs116 - add coumn numbers (possibly first column number)
     int lineNumber;
 
     // These are only used if HXCPP_DEBUG_HASHES is defined
diff --git a/src/hx/Debug.cpp b/src/hx/Debug.cpp
index 9b250e478..7352fc353 100644
--- a/src/hx/Debug.cpp
+++ b/src/hx/Debug.cpp
@@ -121,7 +121,7 @@ static void setStaticHandler(Dynamic &inStore, Dynamic inValue)
 }
 
 // This is the thread number of the debugger thread, extracted from
-// information about the thread that called 
+// information about the thread that called
 // __hxcpp_dbg_setEventNotificationHandler
 static unsigned int g_debugThreadNumber = -1;
 
@@ -146,12 +146,12 @@ class Profiler
         : mT0(0)
 {
         mDumpFile = inDumpFile;
-   
+
         // When a profiler exists, the profiler thread needs to exist
         gThreadMutex.Lock();
-   
+
         gThreadRefCount += 1;
-   
+
         if (gThreadRefCount == 1) {
 #if defined(HX_WINDOWS)
 #ifndef HX_WINRT
@@ -209,7 +209,7 @@ class Profiler
         results.reserve(mProfileStats.size());
 
         int total = 0;
-        std::map<const char *, ProfileEntry>::iterator iter = 
+        std::map<const char *, ProfileEntry>::iterator iter =
             mProfileStats.begin();
         while (iter != mProfileStats.end()) {
             ProfileEntry &pe = iter->second;
@@ -309,7 +309,7 @@ struct ProfileEntry
             return ((total > inRHS.total) ||
                     ((total == inRHS.total) && (self < inRHS.self)));
         }
-        
+
         const char *fullName;
         int self;
         std::vector<ChildEntry> children;
@@ -321,7 +321,7 @@ struct ProfileEntry
     {
         int millis = 1;
 
-        while (gThreadRefCount > 0) { 
+        while (gThreadRefCount > 0) {
 #ifdef HX_WINDOWS
 #ifndef HX_WINRT
             Sleep(millis);
@@ -408,7 +408,7 @@ class Telemetry
 
         // When a profiler exists, the profiler thread needs to exist
         gThreadMutex.Lock();
-   
+
         gThreadRefCount += 1;
         if (gThreadRefCount == 1) {
 #if defined(HX_WINDOWS)
@@ -647,7 +647,7 @@ class Telemetry
     {
         int millis = 1;
 
-        while (gThreadRefCount > 0) { 
+        while (gThreadRefCount > 0) {
 #ifdef HX_WINDOWS
 #ifndef HX_WINRT
             Sleep(millis);
@@ -723,7 +723,7 @@ class CallStack
     static CallStack *GetCallerCallStack()
     {
         CallStack *stack = tlsCallStack;
- 
+
         if (!stack) {
             int threadNumber = __hxcpp_GetCurrentThreadNumber();
 
@@ -741,7 +741,7 @@ class CallStack
     }
 
     static void RemoveCallStack(int threadNumber)
-{ 
+{
         gMutex.Lock();
 
         CallStack *stack = gMap[threadNumber];
@@ -802,6 +802,7 @@ class CallStack
        #endif
     }
 
+    //cs116 - modify to set column number as well
     #ifdef HXCPP_STACK_LINE
     void SetLine(int inLine)
     {
@@ -873,7 +874,7 @@ class CallStack
         CallStack *stack = CallStack::GetCallerCallStack();
 
         int n = stack->mStackFrames.size() - (skipLast ? 1 : 0);
-        
+
         for (int i = 0; i < n; i++)
         {
             // Reverse call stack to match exception stack
@@ -928,7 +929,7 @@ class CallStack
             CallStack *stack = *stack_iter++;
             threadNumbers.push_back(stack->mThreadNumber);
         }
-        
+
         gMutex.Unlock();
 
         ::Array<Dynamic> ret = Array_obj<Dynamic>::__new();
@@ -967,7 +968,7 @@ class CallStack
                 if (stack->mStackFrames.size() <= stackFrameNumber) {
                     break;
                 }
-                StackVariable *variable = 
+                StackVariable *variable =
                     stack->mStackFrames[stackFrameNumber]->variables;
                 while (variable) {
                     ret->push(String(variable->mHaxeName));
@@ -1017,7 +1018,7 @@ class CallStack
         if ((stackFrameNumber < 0) || (stackFrameNumber >= size)) {
             return markNonexistent;
         }
-        
+
         const char *nameToFind = name.c_str();
 
         StackVariable *sv = stack->mStackFrames[stackFrameNumber]->variables;
@@ -1083,7 +1084,7 @@ class CallStack
             }
             sv = sv->mNext;
         }
-        
+
         return markNonexistent;
     }
 
@@ -1173,7 +1174,7 @@ class CallStack
     {
         CallStack *stack = GetCallerCallStack();
 
-        std::vector<StackFrame *>::reverse_iterator iter = 
+        std::vector<StackFrame *>::reverse_iterator iter =
             stack->mStackFrames.rbegin();
         while (iter != stack->mStackFrames.rend()) {
             StackFrame *frame = *iter++;
@@ -1254,7 +1255,7 @@ class CallStack
         CallStack *stack = hx::CallStack::GetCallerCallStack();
         Telemetry *telemetry = stack->mTelemetry;
         if (telemetry) {
-          //printf("Telemetry %016lx allocating %s at %016lx of size %d\n", telemetry, type, obj, inSize); 
+          //printf("Telemetry %016lx allocating %s at %016lx of size %d\n", telemetry, type, obj, inSize);
           telemetry->HXTAllocation(stack, obj, inSize, type);
         }
     }
@@ -1324,7 +1325,7 @@ class CallStack
     {
         return mStackFrames[depth]->fullName;
     }
-        
+
 
     // Wait for someone to call Continue() on this call stack.  Really only
     // the thread that owns this call stack should call Wait().
@@ -1401,7 +1402,7 @@ class CallStack
 #define EXCEPTION_PRINT(...) \
         printf(__VA_ARGS__)
 #endif
-        
+
         int size = mExceptionStack.size();
 
         for (int i = size - 1; i >= 0; i--) {
@@ -1490,7 +1491,7 @@ class CallStack
         Dynamic ret = g_newStackFrameFunction
             (String(frame->fileName), String(frame->lineNumber),
              String(frame->className), String(frame->functionName));
-        
+
         // Don't do parameters for now
         // xxx figure them out later
 
@@ -1557,9 +1558,9 @@ class Breakpoints
         gMutex.Lock();
 
         int ret = gNextBreakpointNumber++;
-        
+
         Breakpoints *newBreakpoints = new Breakpoints(gBreakpoints, ret, fileName, lineNumber);
-        
+
         gBreakpoints->RemoveRef();
 
         // Write memory barrier ensures that newBreakpoints values are updated
@@ -1585,14 +1586,14 @@ class Breakpoints
         if (!className) {
             return -1;
         }
-        
+
         gMutex.Lock();
 
         int ret = gNextBreakpointNumber++;
-        
+
         Breakpoints *newBreakpoints = new Breakpoints
             (gBreakpoints, ret, className, functionName);
-        
+
         gBreakpoints->RemoveRef();
 
         // Write memory barrier ensures that newBreakpoints values are updated
@@ -1613,7 +1614,7 @@ class Breakpoints
     static void DeleteAll()
     {
         gMutex.Lock();
-        
+
         Breakpoints *newBreakpoints = new Breakpoints();
 
         gBreakpoints->RemoveRef();
@@ -1634,7 +1635,7 @@ class Breakpoints
     static void Delete(int number)
     {
         gMutex.Lock();
-        
+
         if (gBreakpoints->HasBreakpoint(number)) {
             // Replace mBreakpoints with a copy and remove the breakpoint
             // from it
@@ -1693,7 +1694,7 @@ class Breakpoints
         gStepThread = threadNumber;
         gStepType = stepType;
         gStepCount = stepCount;
-        
+
         CallStack::StepOneThread(threadNumber, gStepLevel);
     }
 
@@ -2064,7 +2065,7 @@ class Breakpoints
 
 /* static */ MyMutex Breakpoints::gMutex;
 /* static */ int Breakpoints::gNextBreakpointNumber;
-/* static */ Breakpoints * volatile Breakpoints::gBreakpoints = 
+/* static */ Breakpoints * volatile Breakpoints::gBreakpoints =
     new Breakpoints();
 /* static */ StepType Breakpoints::gStepType = STEP_NONE;
 /* static */ int Breakpoints::gStepLevel;
@@ -2086,7 +2087,7 @@ void __hxcpp_dbg_setEventNotificationHandler(Dynamic handler)
     hx::g_eventNotificationHandler = handler;
     GCAddRoot(&(hx::g_eventNotificationHandler.mPtr));
       }
- 
+
 
 void __hxcpp_dbg_enableCurrentThreadDebugging(bool enable)
    {
@@ -2098,7 +2099,7 @@ int __hxcpp_dbg_getCurrentThreadNumber()
 {
     return __hxcpp_GetCurrentThreadNumber();
 }
- 
+
 
 Array< ::String> __hxcpp_dbg_getFiles()
 {
@@ -2212,7 +2213,7 @@ Dynamic __hxcpp_dbg_getStackVariableValue(int threadNumber,
                                           bool unsafe, Dynamic markNonexistent,
                                           Dynamic markThreadNotStopped)
 {
-    return hx::CallStack::GetVariableValue(threadNumber, stackFrameNumber, 
+    return hx::CallStack::GetVariableValue(threadNumber, stackFrameNumber,
                                            name, unsafe, markNonexistent,
                                            markThreadNotStopped);
 }
@@ -2296,7 +2297,7 @@ Dynamic __hxcpp_dbg_checkedThrow(Dynamic toThrow)
 	#ifdef HX_WINRT
 	//todo
         hx::CriticalErrorHandler(HX_CSTRING("Uncatchable Throw: " ), true);
-	
+
 	#else
         hx::CriticalErrorHandler(HX_CSTRING("Uncatchable Throw: " +
                                             toThrow->toString()), true);
@@ -2330,7 +2331,7 @@ void hx::__hxcpp_register_stack_frame(hx::StackFrame *inFrame)
     hx::CallStack::PushCallerStackFrame(inFrame);
 }
 
-    
+
 hx::StackFrame::~StackFrame()
 {
     hx::CallStack::PopCallerStackFrame();
@@ -2476,7 +2477,7 @@ int hx::Telemetry::ComputeCallStackId(hx::CallStack *stack) {
         int name_id = callstack.at(i++);
         //printf("Finding child with id=%d, asime now %#010x\n", name_id, asime);
         std::map<int, AllocStackIdMapEntry*>::iterator lb = asime->children.lower_bound(name_id);
-         
+
         if (lb != asime->children.end() && !(asime->children.key_comp()(name_id, lb->first)))
         {   // key already exists
             asime = lb->second;
@@ -2831,6 +2832,7 @@ void __hx_stack_set_last_exception()
 
 void __hxcpp_set_stack_frame_line(int inLine)
 {
+//cs116 - modify to accept column numbers
 #ifdef HXCPP_STACK_LINE
     hx::CallStack::GetCallerCallStack()->SetLine(inLine);
 #endif
@@ -2877,4 +2879,3 @@ void __hxcpp_set_debugger_info(const char **inAllClasses, const char **inFullPat
    __all_classes = inAllClasses;
    __all_files_fullpath = inFullPaths;
 }
-   

From a48c3aa364a87c8775406f9c18c62173f2e08b3d Mon Sep 17 00:00:00 2001
From: mike <mike@eduroam-169-233-236-113.ucsc.edu>
Date: Mon, 1 Feb 2016 10:18:19 -0800
Subject: [PATCH 02/14] Added column functionality

---
 include/hx/Debug.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/hx/Debug.h b/include/hx/Debug.h
index 93753a65e..f06df10f7 100644
--- a/include/hx/Debug.h
+++ b/include/hx/Debug.h
@@ -400,7 +400,7 @@ extern volatile bool gShouldCallHandleBreakpoints;
 #ifdef HXCPP_STACK_LINE
 // If the debugger is enabled, must check for a breakpoint at every line.
 #ifdef HXCPP_DEBUGGER
-#define HX_STACK_LINE(number)                                           \
+#define HX_STACK_LINE(number, column)                                           \
     __stackframe.lineNumber = number;                                   \
     /* This is incorrect - a read memory barrier is needed here. */     \
     /* For now, just live with the exceedingly rare cases where */      \
@@ -409,7 +409,7 @@ extern volatile bool gShouldCallHandleBreakpoints;
         __hxcpp_on_line_changed();                               \
    }
 #else
-#define HX_STACK_LINE(number) __stackframe.lineNumber = number;
+#define HX_STACK_LINE(number, column) __stackframe.lineNumber = number;
 #endif // HXCPP_DEBUGGER
 #endif // HXCPP_STACK_LINE
 
@@ -454,7 +454,7 @@ extern volatile bool gShouldCallHandleBreakpoints;
 #define HX_STACK_VAR(cpp_var, haxe_name)
 #endif
 #ifndef HX_STACK_LINE
-#define HX_STACK_LINE(number)
+#define HX_STACK_LINE(number, column)
 #endif
 #ifndef HX_STACK_CATCHABLE
 #define HX_STACK_CATCHABLE(T, n)

From ad3f3c238ed2326a70ec35762bb5a2d51520c171 Mon Sep 17 00:00:00 2001
From: mike <mike@eduroam-169-233-205-135.ucsc.edu>
Date: Thu, 4 Feb 2016 11:52:09 -0800
Subject: [PATCH 03/14] Modified C functions to track column numbers

---
 include/hx/Debug.h                            |   8 +-
 src/hx/Debug.cpp                              |  11 +-
 src/hx/cppia/Cppia.cpp                        | 147 +++++++++---------
 src/hx/cppia/Cppia.h                          |   7 +-
 src/hx/cppia/CppiaStream.h                    |   3 +-
 src/hx/cppia/sljit_src/sljitNativeTILEGX_64.c |   7 +-
 6 files changed, 94 insertions(+), 89 deletions(-)

diff --git a/include/hx/Debug.h b/include/hx/Debug.h
index f06df10f7..b9f8c7310 100644
--- a/include/hx/Debug.h
+++ b/include/hx/Debug.h
@@ -55,7 +55,7 @@ void __hxcpp_execution_trace(int inLevel);
 
 // Used by debug breakpoints and execution trace
 HXCPP_EXTERN_CLASS_ATTRIBUTES
-void __hxcpp_set_stack_frame_line(int);
+void __hxcpp_set_stack_frame_line(int, int);
 
 HXCPP_EXTERN_CLASS_ATTRIBUTES
 void __hxcpp_on_line_changed();
@@ -155,11 +155,13 @@ class StackFrame
     const char *fullName; // this is className.functionName - used for profiler
     const char *fileName;
     int firstLineNumber;
+    int firstColumnNumber;
 
     // Current line number, changes during the lifetime of the stack frame.
     // Only updated if HXCPP_STACK_LINE is defined.
     //cs116 - add coumn numbers (possibly first column number)
     int lineNumber;
+    int columnNumber;
 
     // These are only used if HXCPP_DEBUG_HASHES is defined
     int fileHash;
@@ -401,7 +403,7 @@ extern volatile bool gShouldCallHandleBreakpoints;
 // If the debugger is enabled, must check for a breakpoint at every line.
 #ifdef HXCPP_DEBUGGER
 #define HX_STACK_LINE(number, column)                                           \
-    __stackframe.lineNumber = number;                                   \
+    __stackframe.lineNumber = number; __stackframe.columnNumber = column;                                   \
     /* This is incorrect - a read memory barrier is needed here. */     \
     /* For now, just live with the exceedingly rare cases where */      \
     /* breakpoints are missed */                                        \
@@ -409,7 +411,7 @@ extern volatile bool gShouldCallHandleBreakpoints;
         __hxcpp_on_line_changed();                               \
    }
 #else
-#define HX_STACK_LINE(number, column) __stackframe.lineNumber = number;
+#define HX_STACK_LINE(number, column) __stackframe.lineNumber = number; __stackframe.columnNumber = column;
 #endif // HXCPP_DEBUGGER
 #endif // HXCPP_STACK_LINE
 
diff --git a/src/hx/Debug.cpp b/src/hx/Debug.cpp
index 7352fc353..a3c4e682c 100644
--- a/src/hx/Debug.cpp
+++ b/src/hx/Debug.cpp
@@ -3,6 +3,7 @@
 #include <map>
 #include <vector>
 #include <string>
+#include <stdio.h>
 #include <hx/Debug.h>
 #include <hx/Thread.h>
 #include <hx/Telemetry.h>
@@ -796,7 +797,7 @@ class CallStack
     {
        StackFrame *frame = mStackFrames[mStackFrames.size()-1];
        #ifdef HXCPP_STACK_LINE
-       DBGLOG("%s::%s : %d\n", frame->className, frame->functionName, frame->lineNumber);
+       DBGLOG("%s::%s : %d.%d\n", frame->className, frame->functionName, frame->lineNumber, frame->columnNumber);
        #else
        DBGLOG("%s::%s\n", frame->className, frame->functionName);
        #endif
@@ -804,9 +805,11 @@ class CallStack
 
     //cs116 - modify to set column number as well
     #ifdef HXCPP_STACK_LINE
-    void SetLine(int inLine)
+    void SetLine(int inLine, int inColumn)
     {
+       printf("Line: %d, Column: %d\n", inLine, inColumn);
        mStackFrames[mStackFrames.size()-1]->lineNumber = inLine;
+       mStackFrames[mStackFrames.size()-1]->columnNumber = inColumn;
        if (gShouldCallHandleBreakpoints)
           __hxcpp_on_line_changed();
     }
@@ -2830,11 +2833,11 @@ void __hx_stack_set_last_exception()
 #endif
 }
 
-void __hxcpp_set_stack_frame_line(int inLine)
+void __hxcpp_set_stack_frame_line(int inLine, int inColumn)
 {
 //cs116 - modify to accept column numbers
 #ifdef HXCPP_STACK_LINE
-    hx::CallStack::GetCallerCallStack()->SetLine(inLine);
+    hx::CallStack::GetCallerCallStack()->SetLine(inLine, inColumn);
 #endif
 }
 
diff --git a/src/hx/cppia/Cppia.cpp b/src/hx/cppia/Cppia.cpp
index c92ae61a3..46f45c015 100644
--- a/src/hx/cppia/Cppia.cpp
+++ b/src/hx/cppia/Cppia.cpp
@@ -260,7 +260,7 @@ struct CppiaDynamicExpr : public CppiaExpr
             compiler.move( inDest.offset(4), StarAddr(TempReg(),(4)) );
             }
             break;
- 
+
          default:
             genObject(compiler, inDest);
       }
@@ -423,7 +423,7 @@ struct ScriptCallable : public CppiaDynamicExpr
    ExprType returnType;
    int argCount;
    int stackSize;
-   
+
    std::vector<CppiaStackVar> args;
    std::vector<bool>          hasDefault;
    std::vector<CppiaConst>    initVals;
@@ -576,7 +576,7 @@ struct ScriptCallable : public CppiaDynamicExpr
              }
        }
    }
- 
+
 
    void genArgs(CppiaCompiler &compiler, CppiaExpr *inThis, Expressions &inArgs)
    {
@@ -910,7 +910,7 @@ struct ScriptCallable : public CppiaDynamicExpr
                default:
                   ctx->pushObject(0);
             }
- 
+
          }
       }
    }
@@ -958,7 +958,7 @@ struct ScriptCallable : public CppiaDynamicExpr
       }
    }
 
-   
+
    bool pushDefault(CppiaCtx *ctx,int arg)
    {
       if (!hasDefault[arg])
@@ -1098,7 +1098,7 @@ void CppiaFunction::compile()
 class CppiaEnumBase : public EnumBase_obj
 {
 public:
-   CppiaClassInfo *classInfo; 
+   CppiaClassInfo *classInfo;
 
    CppiaEnumBase(CppiaClassInfo *inInfo) : classInfo(inInfo) { }
 
@@ -1117,7 +1117,7 @@ struct CppiaEnumConstructor
       int nameId;
       int typeId;
    };
- 
+
    std::vector<Arg> args;
    CppiaClassInfo   *classInfo;
    int              nameId;
@@ -1138,7 +1138,7 @@ struct CppiaEnumConstructor
          int typeId = inStream.getInt();
          args.push_back( Arg(nameId,typeId) );
       }
-         
+
    }
    hx::Object *create( Array<Dynamic> inArgs )
    {
@@ -1703,7 +1703,7 @@ struct CppiaClassInfo
                if (strcmp(f->name,"toString"))
                   vtable.push_back( findInterfaceFunction(f->name) );
          }
-            
+
       }
 
       CppiaClassInfo *cls = cppia.types[inTypeId]->cppiaClass;
@@ -1923,7 +1923,7 @@ struct CppiaClassInfo
 
 
       DBGLOG("  script member vars size = %d\n", extraData);
- 
+
       for(int i=0;i<staticVars.size();i++)
       {
          DBGLOG("   link static var %s\n", cppia.identStr(staticVars[i]->nameId));
@@ -1989,7 +1989,7 @@ struct CppiaClassInfo
          {
             TypeData *interface = cppia.types[id];
             interfaceVTables[ interface->name.__s ] = vtable;
- 
+
             CppiaClassInfo  *cppiaInterface = interface->cppiaClass;
             if (!cppiaInterface)
                 break;
@@ -2151,7 +2151,7 @@ struct CppiaClassInfo
                nativeProperties.insert( var.name );
          }
       }
-   
+
       for(int i=0;i<staticVars.size();i++)
       {
          CppiaVar &var = *staticVars[i];
@@ -2190,7 +2190,7 @@ struct CppiaClassInfo
       unsigned char *pointer = ctx->pointer;
       ctx->push( (hx::Object *) 0 ); // this
       AutoStack save(ctx,pointer);
- 
+
       if (inPhase==0)
       {
          for(int i=0;i<staticVars.size();i++)
@@ -2339,7 +2339,7 @@ struct CppiaClassInfo
             FieldMapAppendFields(map, ioFields);
       }
    }
-   
+
    Array<String> GetClassFields()
    {
       Array<String> result = Array_obj<String>::__new();
@@ -2530,7 +2530,7 @@ class CppiaClass : public hx::Class_obj
 
       Expressions none;
       return info->createInstance(CppiaCtx::getCurrent(),none,false);
-   } 
+   }
 
    Dynamic ConstructArgs(hx::DynamicArray inArgs)
    {
@@ -3241,7 +3241,7 @@ void convertResult(CppiaCompiler &compiler, const Addr &dest, ExprType destType,
             }
             compiler.move( dest, returnVal );
             break;
- 
+
 
 
          case etString:
@@ -3263,7 +3263,7 @@ void convertResult(CppiaCompiler &compiler, const Addr &dest, ExprType destType,
             compiler.move32( dest,returnVal );
             compiler.move( dest.offset(4),returnVal.offset(4) );
             break;
- 
+
          default: ;
       }
 }
@@ -3354,7 +3354,7 @@ struct CallFunExpr : public CppiaExpr
       // AutoStack
       compiler.move(pointer, CtxMemberVal(offsetof(CppiaCtx,pointer) ) );
       compiler.move(frame, CtxMemberVal(offsetof(CppiaCtx,frame) ) );
- 
+
       compiler.trace("gen args...");
       // Push args
       function->genArgs(compiler,thisExpr,args);
@@ -3827,7 +3827,7 @@ struct NewExpr : public CppiaDynamicExpr
          Array< Dynamic > argList = Array_obj<Dynamic>::__new(n,n);
          for(int a=0;a<n;a++)
             argList[a].mPtr = args[a]->runObject(ctx);
-            
+
           return constructor(argList).mPtr;
       }
       else
@@ -3838,7 +3838,7 @@ struct NewExpr : public CppiaDynamicExpr
       printf("Can't create non haxe type\n");
       return 0;
    }
-   
+
 };
 
 template<typename T>
@@ -3880,7 +3880,7 @@ struct CallHaxe : public CppiaExpr
          {
             case sigInt: case sigFloat: case sigString: case sigObject:
                break; // Ok
-            case sigVoid: 
+            case sigVoid:
                if (i==0) // return void ok
                   break;
                // fallthough
@@ -3982,7 +3982,7 @@ struct CallStatic : public CppiaExpr
    int classId;
    int fieldId;
    Expressions args;
-  
+
    CallStatic(CppiaStream &stream)
    {
       classId = stream.getInt();
@@ -4024,7 +4024,7 @@ struct CallStatic : public CppiaExpr
       // TODO - optimise...
       if (!replace && type->name==HX_CSTRING("String") && field==HX_CSTRING("fromCharCode"))
          replace = new CallDynamicFunction(inModule, this, String::fromCharCode_dyn(), args );
-         
+
 
       //printf(" static call to %s::%s (%d)\n", type->name.__s, field.__s, type->cppiaClass!=0);
       if (replace)
@@ -4046,7 +4046,7 @@ struct CallStatic : public CppiaExpr
 struct CallGetIndex : public CppiaIntExpr
 {
    CppiaExpr   *thisExpr;
-  
+
    CallGetIndex(CppiaExpr *inSrc, CppiaExpr *inThis) : CppiaIntExpr(inSrc)
    {
       thisExpr = inThis;
@@ -4073,7 +4073,7 @@ struct CallSetField : public CppiaDynamicExpr
    CppiaExpr   *nameExpr;
    CppiaExpr   *valueExpr;
    CppiaExpr   *isPropExpr;
-  
+
    CallSetField(CppiaExpr *inSrc, CppiaExpr *inThis, CppiaExpr *inName, CppiaExpr *inValue, CppiaExpr *inProp) :
       CppiaDynamicExpr(inSrc)
    {
@@ -4109,7 +4109,7 @@ struct CallGetField : public CppiaDynamicExpr
    CppiaExpr   *thisExpr;
    CppiaExpr   *nameExpr;
    CppiaExpr   *isPropExpr;
-  
+
    CallGetField(CppiaExpr *inSrc, CppiaExpr *inThis, CppiaExpr *inName, CppiaExpr *inProp) : CppiaDynamicExpr(inSrc)
    {
       thisExpr = inThis;
@@ -4183,23 +4183,23 @@ struct CallMemberVTable : public CppiaExpr
    int runInt(CppiaCtx *ctx)
    {
       CALL_VTABLE_SETUP
-      return runContextConvertInt(ctx, returnType, vtable[slot]); 
+      return runContextConvertInt(ctx, returnType, vtable[slot]);
    }
- 
+
    Float runFloat(CppiaCtx *ctx)
    {
       CALL_VTABLE_SETUP
-      return runContextConvertFloat(ctx, returnType, vtable[slot]); 
+      return runContextConvertFloat(ctx, returnType, vtable[slot]);
    }
    String runString(CppiaCtx *ctx)
    {
       CALL_VTABLE_SETUP
-      return runContextConvertString(ctx, returnType, vtable[slot]); 
+      return runContextConvertString(ctx, returnType, vtable[slot]);
    }
    hx::Object *runObject(CppiaCtx *ctx)
    {
       CALL_VTABLE_SETUP
-      return runContextConvertObject(ctx, returnType, vtable[slot]); 
+      return runContextConvertObject(ctx, returnType, vtable[slot]);
    }
 
 
@@ -4250,7 +4250,7 @@ struct CallGlobal : public CppiaExpr
 {
    int fieldId;
    Expressions args;
-  
+
    CallGlobal(CppiaStream &stream)
    {
       fieldId = stream.getInt();
@@ -4320,7 +4320,7 @@ struct FieldByName : public CppiaDynamicExpr
    CrementOp   crement;
    hx::Class       staticClass;
 
-   
+
    FieldByName(CppiaExpr *inSrc, CppiaExpr *inObject, hx::Class inStaticClass,
                String inName, AssignOp inAssign, CrementOp inCrement, CppiaExpr *inValue)
       : CppiaDynamicExpr(inSrc)
@@ -4417,7 +4417,7 @@ struct GetFieldByName : public CppiaDynamicExpr
    bool        isInterface;
    bool        isStatic;
    hx::Class       staticClass;
-  
+
    GetFieldByName(CppiaStream &stream,bool isThisObject,bool inIsStatic=false)
    {
       classId = stream.getInt();
@@ -4515,7 +4515,7 @@ struct GetFieldByName : public CppiaDynamicExpr
       {
          //if (isInterface)
          //   instance = instance->__GetRealObject();
- 
+
          ScriptCallable **vtable = (ScriptCallable **)instance->__GetScriptVTable();
          ScriptCallable *func = vtable[vtableSlot];
          if (func==0)
@@ -4527,7 +4527,7 @@ struct GetFieldByName : public CppiaDynamicExpr
       }
       return instance->__Field(name,HX_PROP_DYNAMIC).mPtr;
    }
-  
+
    CppiaExpr   *makeSetter(AssignOp inOp,CppiaExpr *inValue)
    {
       // delete this - remove markable?
@@ -4560,7 +4560,7 @@ struct Call : public CppiaDynamicExpr
 {
    Expressions args;
    CppiaExpr   *func;
-  
+
    Call(CppiaStream &stream)
    {
       int argCount = stream.getInt();
@@ -4676,7 +4676,7 @@ struct Call : public CppiaDynamicExpr
       CtxMemberVal pointer(offsetof(CppiaCtx,pointer));
       compiler.move(pointerSave, pointer);
 
- 
+
 
 
       // TODO - shortcut for script->script
@@ -4719,7 +4719,7 @@ struct CallMember : public CppiaExpr
    CppiaExpr *thisExpr;
    Expressions args;
    bool    callSuperField;
-  
+
    CallMember(CppiaStream &stream,MemberCallType inCall)
    {
       classId = stream.getInt();
@@ -4779,7 +4779,7 @@ struct CallMember : public CppiaExpr
       //printf("  linking call %s::%s\n", type->name.__s, field.__s);
 
       CppiaExpr *replace = 0;
-      
+
       if (type->arrayType)
       {
          replace = createArrayBuiltin(this, type->arrayType, thisExpr, field, args);
@@ -4885,7 +4885,7 @@ struct CallMember : public CppiaExpr
 
 
 
-template<typename T, int REFMODE> 
+template<typename T, int REFMODE>
 struct MemReference : public CppiaExpr
 {
    int  offset;
@@ -4917,7 +4917,7 @@ struct MemReference : public CppiaExpr
       offset = 0;
       pointer = inPointer;
    }
- 
+
    ExprType getType()
    {
       return (ExprType) ExprTypeOf<T>::value;
@@ -4929,7 +4929,7 @@ struct MemReference : public CppiaExpr
          object = object->link(inModule);
       if (REFMODE==locAbsolute) // Only for string/object?
          inModule.markable.push_back(this);
- 
+
       return this;
    }
 
@@ -5001,7 +5001,7 @@ CppiaExpr *createStaticAccess(CppiaExpr *inSrc,FieldStorage inType, void *inPtr)
 
 
 
-template<typename T, int REFMODE, typename Assign> 
+template<typename T, int REFMODE, typename Assign>
 struct MemReferenceSetter : public CppiaExpr
 {
    int offset;
@@ -5073,7 +5073,7 @@ struct MemReferenceSetter : public CppiaExpr
 };
 
 
-template<typename T, int REFMODE> 
+template<typename T, int REFMODE>
 CppiaExpr *MemReference<T,REFMODE>::makeSetter(AssignOp op,CppiaExpr *value)
 {
    switch(op)
@@ -5110,7 +5110,7 @@ CppiaExpr *MemReference<T,REFMODE>::makeSetter(AssignOp op,CppiaExpr *value)
 
 
 
-template<typename T, int REFMODE,typename CREMENT> 
+template<typename T, int REFMODE,typename CREMENT>
 struct MemReferenceCrement : public CppiaExpr
 {
    int offset;
@@ -5176,7 +5176,7 @@ struct MemReferenceCrement : public CppiaExpr
 
 
 
-template<typename T, int REFMODE> 
+template<typename T, int REFMODE>
 CppiaExpr *MemReference<T,REFMODE>::makeCrement(CrementOp inOp)
 {
    switch(inOp)
@@ -5204,7 +5204,7 @@ struct MemStackFloatSetter : public CppiaExpr
    AssignOp op;
 
    MemStackFloatSetter(const CppiaExpr *inSrc, int inOffset, AssignOp inOp, CppiaExpr *inValue)
-      : CppiaExpr(inSrc), offset(inOffset), op(inOp), value(inValue){ } 
+      : CppiaExpr(inSrc), offset(inOffset), op(inOp), value(inValue){ }
    ExprType getType() { return etFloat; }
 
    inline Float doRun(CppiaCtx *ctx)
@@ -5243,7 +5243,7 @@ struct MemStackFloatCrement : public CppiaExpr
    CrementOp op;
 
    MemStackFloatCrement(const CppiaExpr *inSrc, int inOffset, CrementOp inOp)
-      : CppiaExpr(inSrc), offset(inOffset), op(inOp) { } 
+      : CppiaExpr(inSrc), offset(inOffset), op(inOp) { }
    ExprType getType() { return etFloat; }
 
    inline Float doRun(CppiaCtx *ctx)
@@ -5308,7 +5308,7 @@ struct GetFieldByLinkage : public CppiaExpr
    int         fieldId;
    int         typeId;
    CppiaExpr   *object;
-  
+
    GetFieldByLinkage(CppiaStream &stream,bool inThisObject)
    {
       typeId = stream.getInt();
@@ -5518,6 +5518,7 @@ struct PosInfo : public CppiaExprWithValue
 {
    int fileId;
    int line;
+   int column;
    int classId;
    int methodId;
 
@@ -5609,7 +5610,7 @@ struct ArrayDef : public CppiaDynamicExpr
       switch(arrayType)
       {
          case arrBool:
-            { 
+            {
             Array<bool> result = Array_obj<bool>::__new(n,n);
             for(int i=0;i<n;i++)
             {
@@ -5619,7 +5620,7 @@ struct ArrayDef : public CppiaDynamicExpr
             return result.mPtr;
             }
          case arrUnsignedChar:
-            { 
+            {
             Array<unsigned char> result = Array_obj<unsigned char>::__new(n,n);
             for(int i=0;i<n;i++)
             {
@@ -5629,7 +5630,7 @@ struct ArrayDef : public CppiaDynamicExpr
             return result.mPtr;
             }
          case arrInt:
-            { 
+            {
             Array<int> result = Array_obj<int>::__new(n,n);
             for(int i=0;i<n;i++)
             {
@@ -5639,7 +5640,7 @@ struct ArrayDef : public CppiaDynamicExpr
             return result.mPtr;
             }
          case arrFloat:
-            { 
+            {
             Array<Float> result = Array_obj<Float>::__new(n,n);
             for(int i=0;i<n;i++)
             {
@@ -5649,7 +5650,7 @@ struct ArrayDef : public CppiaDynamicExpr
             return result.mPtr;
             }
          case arrString:
-            { 
+            {
             Array<String> result = Array_obj<String>::__new(n,n);
             for(int i=0;i<n;i++)
             {
@@ -5660,7 +5661,7 @@ struct ArrayDef : public CppiaDynamicExpr
             }
          case arrObject:
          case arrAny:
-            { 
+            {
             Array<Dynamic> result = Array_obj<Dynamic>::__new(n,n);
             for(int i=0;i<n;i++)
             {
@@ -5856,7 +5857,7 @@ struct ArrayAccessI : public CppiaDynamicExpr
       }
    }
 
-   
+
    template<typename T>
    void run(CppiaCtx *ctx,T &outValue)
    {
@@ -6152,7 +6153,7 @@ struct TVars : public CppiaVoidExpr
       LinkExpressions(vars,inModule);
       return this;
    }
-   
+
    void runVoid(CppiaCtx *ctx)
    {
       CppiaExpr **v = &vars[0];
@@ -6168,7 +6169,7 @@ struct ForExpr : public CppiaVoidExpr
    CppiaExpr *init;
    CppiaExpr *loop;
 
- 
+
    ForExpr(CppiaStream &stream)
    {
       var.fromStream(stream);
@@ -6219,7 +6220,7 @@ struct WhileExpr : public CppiaVoidExpr
    CppiaExpr *condition;
    CppiaExpr *loop;
 
- 
+
    WhileExpr(CppiaStream &stream)
    {
       isWhileDo = stream.getInt();
@@ -6273,7 +6274,7 @@ struct SwitchExpr : public CppiaExpr
    std::vector<Case> cases;
    CppiaExpr *defaultCase;
 
- 
+
    SwitchExpr(CppiaStream &stream)
    {
       caseCount = stream.getInt();
@@ -6398,7 +6399,7 @@ struct TryExpr : public CppiaVoidExpr
    CppiaExpr *body;
    std::vector<Catch> catches;
 
- 
+
    TryExpr(CppiaStream &stream)
    {
       catchCount = stream.getInt();
@@ -6938,7 +6939,7 @@ struct SpecialAdd : public CppiaExpr
          BCR_CHECK;
          return (lval + Dynamic(right->runObject(ctx))).mPtr;
       }
- 
+
       return Dynamic(runString(ctx)).mPtr;
    }
    int runInt(CppiaCtx *ctx)
@@ -6949,7 +6950,7 @@ struct SpecialAdd : public CppiaExpr
          BCR_CHECK;
          return (lval + Dynamic(right->runObject(ctx)))->__ToInt();
       }
- 
+
       left->runVoid(ctx);
       BCR_CHECK;
       right->runVoid(ctx);
@@ -6963,7 +6964,7 @@ struct SpecialAdd : public CppiaExpr
          BCR_CHECK;
          return (lval + Dynamic(right->runObject(ctx)))->__ToDouble();
       }
- 
+
       left->runVoid(ctx);
       BCR_CHECK;
       right->runVoid(ctx);
@@ -7153,7 +7154,7 @@ struct EnumField : public CppiaDynamicExpr
 #endif
 };
 
-struct CrementExpr : public CppiaExpr 
+struct CrementExpr : public CppiaExpr
 {
    CrementOp op;
    CppiaExpr *lvalue;
@@ -7180,7 +7181,7 @@ struct CrementExpr : public CppiaExpr
    }
 };
 
-struct OpCompareBase : public CppiaBoolExpr 
+struct OpCompareBase : public CppiaBoolExpr
 {
    enum CompareType { compFloat, compInt, compString, compDynamic };
 
@@ -7226,7 +7227,7 @@ struct OpCompareBase : public CppiaBoolExpr
 };
 
 template<typename COMPARE>
-struct OpCompare : public OpCompareBase 
+struct OpCompare : public OpCompareBase
 {
    COMPARE compare;
 
@@ -7646,7 +7647,7 @@ void CppiaModule::link()
 {
    DBGLOG("Resolve registered - super\n");
    HaxeNativeClass::link();
-   
+
    DBGLOG("Resolve typeIds\n");
    for(int t=0;t<types.size();t++)
       types[t]->link(*this);
@@ -7759,7 +7760,7 @@ bool LoadCppia(String inValue)
 {
    CppiaModule   *cppiaPtr = new CppiaModule();
    hx::Object **ptrPtr = new hx::Object*[1];
-   *ptrPtr = new CppiaObject(cppiaPtr); 
+   *ptrPtr = new CppiaObject(cppiaPtr);
    GCAddRoot(ptrPtr);
 
 
@@ -7826,7 +7827,7 @@ bool LoadCppia(String inValue)
             tok = stream.getToken();
             if (tok!="RESO")
                throw "no reso tag";
-            
+
             scriptResources[r].mName = cppia.strings[stream.getInt()];
             scriptResources[r].mDataLength = stream.getInt();
          }
@@ -7845,7 +7846,7 @@ bool LoadCppia(String inValue)
          scriptResources[count].mDataLength = 0;
          scriptResources[count].mData = 0;
          scriptResources[count].mName = String();
-         
+
          RegisterResources(&scriptResources[0]);
       }
       else
@@ -7984,5 +7985,3 @@ void __scriptable_load_cppia(String inCode)
 {
    hx::LoadCppia(inCode);
 }
-
-
diff --git a/src/hx/cppia/Cppia.h b/src/hx/cppia/Cppia.h
index 4f7df21d3..060e8ab86 100644
--- a/src/hx/cppia/Cppia.h
+++ b/src/hx/cppia/Cppia.h
@@ -100,6 +100,7 @@ enum VarLocation
 struct CppiaExpr
 {
    int line;
+   int column;
    const char *filename;
    const char *className;
    const char *functionName;
@@ -323,7 +324,7 @@ struct CppiaVar
    Float            floatVal;
    String           stringVal;
    void             *valPointer;
-   
+
 
    CppiaVar(bool inIsStatic);
    CppiaVar(CppiaFunction *inDynamicFunction);
@@ -411,7 +412,7 @@ class HaxeNativeInterface
 
 #ifdef HXCPP_STACK_LINE
    #define CPPIA_STACK_LINE(expr) \
-          __hxcpp_set_stack_frame_line(expr->line);
+          __hxcpp_set_stack_frame_line(expr->line, expr->column);
 #else
    #define CPPIA_STACK_LINE(expr)
 #endif
@@ -609,7 +610,7 @@ struct CrementPostDec
       inVal = Dynamic(Dynamic(inVal) + 1).mPtr;
       return result;
    }
- 
+
 };
 
 
diff --git a/src/hx/cppia/CppiaStream.h b/src/hx/cppia/CppiaStream.h
index 44336630f..d9993a73a 100644
--- a/src/hx/cppia/CppiaStream.h
+++ b/src/hx/cppia/CppiaStream.h
@@ -13,6 +13,7 @@ struct CppiaStream
    const char *data;
    const char *max;
    int line;
+   int column;
    int pos;
 
    CppiaStream(class CppiaModule *inModule,const char *inData, int inLen)
@@ -197,5 +198,3 @@ struct CppiaStream
 };
 
 } // end namespace hx
-
-
diff --git a/src/hx/cppia/sljit_src/sljitNativeTILEGX_64.c b/src/hx/cppia/sljit_src/sljitNativeTILEGX_64.c
index 1d6aa5a11..74f4a295e 100644
--- a/src/hx/cppia/sljit_src/sljitNativeTILEGX_64.c
+++ b/src/hx/cppia/sljit_src/sljitNativeTILEGX_64.c
@@ -120,12 +120,13 @@ SLJIT_API_FUNC_ATTRIBUTE SLJIT_CONST char *sljit_get_platform_name(void)
 typedef sljit_uw sljit_ins;
 
 struct jit_instr {
-	const struct tilegx_opcode* opcode; 
+	const struct tilegx_opcode* opcode;
 	tilegx_pipeline pipe;
 	unsigned long input_registers;
 	unsigned long output_registers;
 	int operand_value[4];
 	int line;
+	int column;
 };
 
 /* Opcode Helper Macros */
@@ -896,7 +897,7 @@ static sljit_si push_jr_buffer(struct sljit_compiler *compiler, tilegx_mnemonic
 	inst_buf[inst_buf_index].output_registers = 0;
 	inst_buf[inst_buf_index].line = line;
 	inst_buf_index++;
- 
+
 	return flush_buffer(compiler);
 }
 
@@ -1811,7 +1812,7 @@ static SLJIT_INLINE sljit_si emit_single_op(struct sljit_compiler *compiler, slj
 				else {
 					/* Rare ocasion. */
 					FAIL_IF(ADD(TMP_EREG2, reg_map[src1], ZERO));
-	
+
 					overflow_ra = TMP_EREG2;
 				}
 			}

From 0c68c0a80fa56e97545ee9bbde69f288717b8076 Mon Sep 17 00:00:00 2001
From: mike <mike@Sauron-2.local>
Date: Sat, 6 Feb 2016 01:54:44 -0800
Subject: [PATCH 04/14] More column stuff

---
 include/hx/Debug.h |  2 +-
 src/hx/Debug.cpp   | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/hx/Debug.h b/include/hx/Debug.h
index b9f8c7310..09ebd69ec 100644
--- a/include/hx/Debug.h
+++ b/include/hx/Debug.h
@@ -491,7 +491,7 @@ Array< ::String> __hxcpp_dbg_getFilesFullPath();
 Array< ::String> __hxcpp_dbg_getClasses();
 Array<Dynamic> __hxcpp_dbg_getThreadInfos();
 Dynamic __hxcpp_dbg_getThreadInfo(int threadNumber, bool unsafe);
-int __hxcpp_dbg_addFileLineBreakpoint(String fileName, int lineNumber);
+int __hxcpp_dbg_addFileLineBreakpoint(String fileName, int lineNumber, int columnNumber);
 int __hxcpp_dbg_addClassFunctionBreakpoint(String className,
                                             String functionName);
 void __hxcpp_dbg_deleteAllBreakpoints();
diff --git a/src/hx/Debug.cpp b/src/hx/Debug.cpp
index a3c4e682c..7e99592f2 100644
--- a/src/hx/Debug.cpp
+++ b/src/hx/Debug.cpp
@@ -854,7 +854,7 @@ class CallStack
 
         gMutex.Unlock();
     }
-
+    //cs116
     static void StepOneThread(int threadNumber, int &stackLevel)
     {
         gMutex.Lock();
@@ -1549,7 +1549,7 @@ class Breakpoints
     }
 #endif
 
-    static int Add(String inFileName, int lineNumber)
+    static int Add(String inFileName, int lineNumber, int columnNumber)
     {
         // Look up the filename constant
         const char *fileName = LookupFileName(inFileName);
@@ -1562,7 +1562,7 @@ class Breakpoints
 
         int ret = gNextBreakpointNumber++;
 
-        Breakpoints *newBreakpoints = new Breakpoints(gBreakpoints, ret, fileName, lineNumber);
+        Breakpoints *newBreakpoints = new Breakpoints(gBreakpoints, ret, fileName, lineNumber, columnNumber);
 
         gBreakpoints->RemoveRef();
 
@@ -1839,6 +1839,7 @@ class Breakpoints
     {
         int number;
         int lineNumber;
+        int columnNumber;
         int hash;
 
         bool isFileLine;
@@ -1858,7 +1859,7 @@ class Breakpoints
 
     // Copies breakpoints from toCopy and adds a new file:line breakpoint
     Breakpoints(const Breakpoints *toCopy, int number,
-                const char *fileName, int lineNumber)
+                const char *fileName, int lineNumber, int columnNumber)
         : mRefCount(1)
     {
         mBreakpointCount = toCopy->mBreakpointCount + 1;
@@ -1870,6 +1871,7 @@ class Breakpoints
         mBreakpoints[toCopy->mBreakpointCount].isFileLine = true;
         mBreakpoints[toCopy->mBreakpointCount].fileOrClassName = fileName;
         mBreakpoints[toCopy->mBreakpointCount].lineNumber = lineNumber;
+        mBreakpoints[toCopy->mBreakpointCount].columnNumber = columnNumber;
 
 #ifdef HXCPP_DEBUG_HASHES
         mBreakpoints[toCopy->mBreakpointCount].hash = Hash(0, fileName);
@@ -2156,9 +2158,9 @@ Dynamic __hxcpp_dbg_getThreadInfo(int threadNumber, bool unsafe)
 }
 
 
-int __hxcpp_dbg_addFileLineBreakpoint(String fileName, int lineNumber)
+int __hxcpp_dbg_addFileLineBreakpoint(String fileName, int lineNumber, int columnNumber)
       {
-    return hx::Breakpoints::Add(fileName, lineNumber);
+    return hx::Breakpoints::Add(fileName, lineNumber,  columnNumber);
    }
 
 

From 6aba1c971329e795ff1ce452c9811fec13616d8f Mon Sep 17 00:00:00 2001
From: mike <mike@eduroam-169-233-205-152.ucsc.edu>
Date: Sat, 6 Feb 2016 16:49:49 -0800
Subject: [PATCH 05/14] Added columnNumber conditional to
 FindFileLineBreakpoint()

---
 src/hx/Debug.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/hx/Debug.cpp b/src/hx/Debug.cpp
index 7e99592f2..4383b2e4f 100644
--- a/src/hx/Debug.cpp
+++ b/src/hx/Debug.cpp
@@ -1997,13 +1997,15 @@ class Breakpoints
         return false;
          }
 
+   //CS116 - We added columnNumber conditional.
    int FindFileLineBreakpoint(StackFrame *inFrame)
    {
+      printf("FindFileLineBreakpoint(), inFrame.columnNumber = %d\n", inFrame->columnNumber);
       for (int i = 0; i < mBreakpointCount; i++)
       {
          Breakpoint &breakpoint = mBreakpoints[i];
          if (breakpoint.isFileLine && breakpoint.hash==inFrame->fileHash &&
-             (breakpoint.lineNumber == inFrame->lineNumber) &&
+             (breakpoint.lineNumber == inFrame->lineNumber) && (breakpoint.columnNumber == inFrame->columnNumber) &&
              !strcmp(breakpoint.fileOrClassName.c_str(),inFrame->fileName) )
             return breakpoint.number;
       }

From b5bf06fa736de9f8adacd07ebad34ea6616594ec Mon Sep 17 00:00:00 2001
From: mike <mike@eduroam-169-233-223-158.ucsc.edu>
Date: Mon, 8 Feb 2016 11:24:06 -0800
Subject: [PATCH 06/14] Added column number print capability - Gave
 HX_STACK_FRAME macro column number

---
 include/hx/Debug.h  | 18 +++++++++---------
 src/hx/Debug.cpp    | 11 +++++++----
 src/hx/Lib.cpp      | 23 +++++++++++------------
 src/hx/gc/Immix.cpp | 33 ++++++++++++++++-----------------
 4 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/include/hx/Debug.h b/include/hx/Debug.h
index 09ebd69ec..8829dd911 100644
--- a/include/hx/Debug.h
+++ b/include/hx/Debug.h
@@ -112,7 +112,7 @@ class StackFrame
                #endif
                const char *inFullName, const char *inFileName
                #ifdef HXCPP_STACK_LINE
-               , int inLineNumber
+               , int inLineNumber, int inColumnNumber
                #endif
                #ifdef HXCPP_DEBUG_HASHES
                , int inFileHash
@@ -351,19 +351,19 @@ extern volatile bool gShouldCallHandleBreakpoints;
 
    #ifdef HXCPP_DEBUG_HASHES
       #define HX_STACK_FRAME(className, functionName, classFunctionHash, fullName,fileName,     \
-                          lineNumber, fileHash ) \
+                          lineNumber, columnNumber, fileHash ) \
        hx::StackFrame __stackframe(className, functionName, classFunctionHash, fullName,      \
-                                   fileName, lineNumber, fileHash);
+                                   fileName, lineNumber, columnNumber, fileHash);
    #else
       #define HX_STACK_FRAME(className, functionName, classFunctionHash, fullName,fileName,     \
-                          lineNumber, fileHash ) \
+                          lineNumber, columnNumber, fileHash ) \
        hx::StackFrame __stackframe(className, functionName, fullName,      \
-                                   fileName, lineNumber);
+                                   fileName, lineNumber, columnNumber);
    #endif
 #else
 
    #define HX_STACK_FRAME(className, functionName, classFunctionHash, fullName,fileName,     \
-                       lineNumber, fileHash ) \
+                       lineNumber, columnNumber, fileHash ) \
     hx::StackFrame __stackframe(className, functionName, fullName, fileName);
 
 #endif
@@ -444,7 +444,7 @@ extern volatile bool gShouldCallHandleBreakpoints;
 
 // Define any macros not defined already above
 #ifndef HX_STACK_FRAME
-#define HX_STACK_FRAME(className, functionName, classFuncHash, fullName, fileName, lineNumber, fileHash )
+#define HX_STACK_FRAME(className, functionName, classFuncHash, fullName, fileName, lineNumber, columnNumber, fileHash )
 #endif
 #ifndef HX_STACK_THIS
 #define HX_STACK_THIS(ptr)
@@ -475,8 +475,8 @@ extern volatile bool gShouldCallHandleBreakpoints;
 // use debugging, you really should upgrade to a newer haxe compiler.
 
 #undef HX_STACK_PUSH
-#define HX_STACK_PUSH(fullName, fileName, lineNumber)                  \
-    HX_STACK_FRAME("", fullName, 0, fullName, fileName, lineNumber, 0)
+#define HX_STACK_PUSH(fullName, fileName, lineNumber, columnNumber)                  \
+    HX_STACK_FRAME("", fullName, 0, fullName, fileName, lineNumber, columnNumber, 0)
 
 
 #ifdef HXCPP_DEBUGGER
diff --git a/src/hx/Debug.cpp b/src/hx/Debug.cpp
index 4383b2e4f..2fd8b1fcc 100644
--- a/src/hx/Debug.cpp
+++ b/src/hx/Debug.cpp
@@ -1440,12 +1440,13 @@ class CallStack
         mCanStop = false;
 
         // Call the handler to announce the status.
+        //CS116 - Added column number to status
         int stackFrame = mStackFrames.size() - 1;
         StackFrame *frame = mStackFrames[stackFrame];
         g_eventNotificationHandler
             (mThreadNumber, THREAD_STOPPED, stackFrame,
              String(frame->className), String(frame->functionName),
-             String(frame->fileName), frame->lineNumber);
+             String(frame->fileName), frame->lineNumber, frame->columnNumber);
 
         // Wait until the debugger thread sets mWaiting to false and signals
         // the semaphore
@@ -1785,7 +1786,7 @@ class Breakpoints
                {
                   // Check for class:function breakpoint if this is the
                   // first line of the stack frame
-                  if (frame->lineNumber == frame->firstLineNumber)
+                  if ((frame->lineNumber == frame->firstLineNumber))
                       breakpointNumber = breakpoints->FindClassFunctionBreakpoint(frame);
                }
 
@@ -2000,14 +2001,16 @@ class Breakpoints
    //CS116 - We added columnNumber conditional.
    int FindFileLineBreakpoint(StackFrame *inFrame)
    {
-      printf("FindFileLineBreakpoint(), inFrame.columnNumber = %d\n", inFrame->columnNumber);
+      //printf("FindFileLineBreakpoint(), inFrame.columnNumber = %d\n", inFrame->columnNumber);
       for (int i = 0; i < mBreakpointCount; i++)
       {
          Breakpoint &breakpoint = mBreakpoints[i];
          if (breakpoint.isFileLine && breakpoint.hash==inFrame->fileHash &&
              (breakpoint.lineNumber == inFrame->lineNumber) && (breakpoint.columnNumber == inFrame->columnNumber) &&
-             !strcmp(breakpoint.fileOrClassName.c_str(),inFrame->fileName) )
+             !strcmp(breakpoint.fileOrClassName.c_str(),inFrame->fileName) ) {
+            printf("Breakpoint reached at %s:%d:%d\n", inFrame->fileName, inFrame->lineNumber, inFrame->columnNumber);
             return breakpoint.number;
+          }
       }
       return -1;
    }
diff --git a/src/hx/Lib.cpp b/src/hx/Lib.cpp
index 9875ffbd7..d774fea72 100644
--- a/src/hx/Lib.cpp
+++ b/src/hx/Lib.cpp
@@ -71,7 +71,7 @@ Module hxLoadLibrary(String inLib)
    #else
    flags |= RTLD_NOW;
    #endif
-   
+
    Module result = dlopen(inLib.__CStr(), flags);
    if (gLoadDebug)
    {
@@ -113,7 +113,7 @@ typedef hx::Object * (*prim_4)(hx::Object *,hx::Object *,hx::Object *,hx::Object
 typedef hx::Object * (*prim_5)(hx::Object *,hx::Object *,hx::Object *,hx::Object *,hx::Object *);
 typedef hx::Object * (*prim_mult)(hx::Object **inArray,int inArgs);
 
-typedef void *(*FundFunc)(); 
+typedef void *(*FundFunc)();
 
  extern const char* EXTERN_CLASS_NAME;
 
@@ -131,42 +131,42 @@ class ExternalPrimitive : public hx::Object
 
    Dynamic __run()
    {
-      HX_STACK_FRAME(EXTERN_CLASS_NAME, "cffi",0, functionName, __FILE__, __LINE__,0);
+      HX_STACK_FRAME(EXTERN_CLASS_NAME, "cffi",0, functionName, __FILE__, __LINE__, 5,0);
       if (mArgCount!=0) throw HX_INVALID_ARG_COUNT;
       if (mProc==0) hx::Throw( HX_NULL_FUNCTION_POINTER );
       return ((prim_0)mProc)();
    }
    Dynamic __run(D a)
    {
-      HX_STACK_FRAME(EXTERN_CLASS_NAME, "cffi",0,  functionName, __FILE__, __LINE__,0);
+      HX_STACK_FRAME(EXTERN_CLASS_NAME, "cffi",0,  functionName, __FILE__, __LINE__, 5, 0);
       if (mArgCount!=1) throw HX_INVALID_ARG_COUNT;
       if (mProc==0) hx::Throw( HX_NULL_FUNCTION_POINTER );
       return ((prim_1)mProc)(a.GetPtr());
    }
    Dynamic __run(D a,D b)
    {
-      HX_STACK_FRAME(EXTERN_CLASS_NAME, "cffi",0,  functionName, __FILE__, __LINE__,0);
+      HX_STACK_FRAME(EXTERN_CLASS_NAME, "cffi",0,  functionName, __FILE__, __LINE__, 5, 0);
       if (mArgCount!=2) throw HX_INVALID_ARG_COUNT;
       if (mProc==0) hx::Throw( HX_NULL_FUNCTION_POINTER );
       return ((prim_2)mProc)(a.GetPtr(),b.GetPtr());
    }
    Dynamic __run(D a,D b,D c)
    {
-      HX_STACK_FRAME(EXTERN_CLASS_NAME, "cffi",0,  functionName, __FILE__, __LINE__,0);
+      HX_STACK_FRAME(EXTERN_CLASS_NAME, "cffi",0,  functionName, __FILE__, __LINE__, 5, 0);
       if (mArgCount!=3) throw HX_INVALID_ARG_COUNT;
       if (mProc==0) hx::Throw( HX_NULL_FUNCTION_POINTER );
       return ((prim_3)mProc)(a.GetPtr(),b.GetPtr(),c.GetPtr());
    }
    Dynamic __run(D a,D b,D c,D d)
    {
-      HX_STACK_FRAME(EXTERN_CLASS_NAME, "cffi",0,  functionName, __FILE__, __LINE__,0);
+      HX_STACK_FRAME(EXTERN_CLASS_NAME, "cffi",0,  functionName, __FILE__, __LINE__, 5, 0);
       if (mArgCount!=4) throw HX_INVALID_ARG_COUNT;
       if (mProc==0) hx::Throw( HX_NULL_FUNCTION_POINTER );
       return ((prim_4)mProc)(a.GetPtr(),b.GetPtr(),c.GetPtr(),d.GetPtr());
    }
    Dynamic __run(D a,D b,D c,D d,D e)
    {
-      HX_STACK_FRAME(EXTERN_CLASS_NAME, "cffi",0,  functionName, __FILE__, __LINE__,0);
+      HX_STACK_FRAME(EXTERN_CLASS_NAME, "cffi",0,  functionName, __FILE__, __LINE__, 5, 0);
       if (mArgCount!=5) throw HX_INVALID_ARG_COUNT;
       if (mProc==0) hx::Throw( HX_NULL_FUNCTION_POINTER );
       return ((prim_5)mProc)(a.GetPtr(),b.GetPtr(),c.GetPtr(),d.GetPtr(),e.GetPtr());
@@ -174,7 +174,7 @@ class ExternalPrimitive : public hx::Object
 
    Dynamic __Run(const Array<Dynamic> &inArgs)
    {
-      HX_STACK_FRAME(EXTERN_CLASS_NAME, "cffi",0,  functionName, __FILE__, __LINE__,0);
+      HX_STACK_FRAME(EXTERN_CLASS_NAME, "cffi",0,  functionName, __FILE__, __LINE__, 5, 0);
       if (mArgCount!=-1 && mArgCount!=inArgs->length)
          throw HX_INVALID_ARG_COUNT;
       if (mProc==0) hx::Throw( HX_NULL_FUNCTION_POINTER );
@@ -502,7 +502,7 @@ void *__hxcpp_get_proc_address(String inLib, String full_name,bool inNdllProc,bo
    #endif
 
    #if defined(HX_WINRT) && defined(HXCPP_DEBUG_LINK)
-   gLoadDebug = true;   
+   gLoadDebug = true;
    #elif defined(IPHONE) || defined(APPLETV)
    gLoadDebug = true;
    setenv("DYLD_PRINT_APIS","1",true);
@@ -514,7 +514,7 @@ void *__hxcpp_get_proc_address(String inLib, String full_name,bool inNdllProc,bo
    if (!sgLibPathIsInit)
    {
       sgLibPathIsInit = true;
-      #ifndef HX_WINRT 
+      #ifndef HX_WINRT
       sgLibPath.push_back("./");
 	  #endif
       #ifdef HX_MACOS
@@ -754,4 +754,3 @@ int __hxcpp_register_prim(const char *inName,void *inProc)
    proc = inProc;
    return 0;
 }
-
diff --git a/src/hx/gc/Immix.cpp b/src/hx/gc/Immix.cpp
index 89229ac0c..0733cf631 100644
--- a/src/hx/gc/Immix.cpp
+++ b/src/hx/gc/Immix.cpp
@@ -377,7 +377,7 @@ union BlockData
    // First 2 bytes are not needed for row markers (first 2 rows are for flags)
    unsigned short mId;
 
-   // First 2 rows contain a byte-flag-per-row 
+   // First 2 rows contain a byte-flag-per-row
    unsigned char  mRowMarked[IMMIX_LINES];
    // Row data as union - don't use first 2 rows
    unsigned char  mRow[IMMIX_LINES][IMMIX_LINE_LEN];
@@ -407,7 +407,7 @@ static BlockDataStats sThreadBlockDataStats[MAX_MARK_THREADS];
 #ifdef HXCPP_VISIT_ALLOCS
 static hx::VisitContext *sThreadVisitContext = 0;
 #endif
-   
+
 
 
 namespace hx { void MarkerReleaseWorkerLocked(); }
@@ -434,7 +434,7 @@ struct GroupInfo
    int  free;
    int  used;
 };
- 
+
 hx::QuickVec<GroupInfo> gAllocGroups;
 
 
@@ -502,7 +502,7 @@ struct BlockDataInfo
       mUsedRows = 0;
       mPinned = false;
       ZERO_MEM(allocStart,sizeof(int)*IMMIX_LINES);
-      ZERO_MEM(mPtr->mRowMarked+IMMIX_HEADER_LINES, IMMIX_USEFUL_LINES); 
+      ZERO_MEM(mPtr->mRowMarked+IMMIX_HEADER_LINES, IMMIX_USEFUL_LINES);
       mRanges[0].start = IMMIX_HEADER_LINES << IMMIX_LINE_BITS;
       mRanges[0].length = IMMIX_USEFUL_LINES << IMMIX_LINE_BITS;
       mMaxHoleSize = mRanges[0].length;
@@ -515,7 +515,7 @@ struct BlockDataInfo
    void makeFull()
    {
       mUsedRows = IMMIX_USEFUL_LINES;
-      memset(mPtr->mRowMarked+IMMIX_HEADER_LINES, 1,IMMIX_USEFUL_LINES); 
+      memset(mPtr->mRowMarked+IMMIX_HEADER_LINES, 1,IMMIX_USEFUL_LINES);
       mRanges[0].start = 0;
       mRanges[0].length = 0;
       mMaxHoleSize = mRanges[0].length;
@@ -1338,7 +1338,7 @@ void MarkObjectAllocUnchecked(hx::Object *inPtr,hx::MarkContext *__inCtx)
              __inCtx->Trace();
       }
       #endif
-      
+
       #ifdef HXCPP_DEBUG
          // Recursive mark so stack stays intact..
          if (gCollectTrace)
@@ -1350,7 +1350,7 @@ void MarkObjectAllocUnchecked(hx::Object *inPtr,hx::MarkContext *__inCtx)
       //   run the risk of stack overflow.  Also, a parallel mark algorithm could be
       //   done when the marking is stack based.
       //inPtr->__Mark(__inCtx);
-  
+
       #if (HXCPP_GC_DEBUG_LEVEL>0)
       inPtr->__Mark(__inCtx);
       #else
@@ -2054,7 +2054,7 @@ class GlobalAllocator
       if (inSize<<1 > mLargeAllocSpace)
          mLargeAllocSpace = inSize<<1;
 
-      unsigned int *result = inClear ? 
+      unsigned int *result = inClear ?
                              (unsigned int *)calloc(1,inSize + sizeof(int)*2) :
                              (unsigned int *)malloc(inSize + sizeof(int)*2);
       if (!result)
@@ -2098,7 +2098,7 @@ class GlobalAllocator
          }
 
          int rounded = (inDelta +3) & ~3;
-   
+
          if (rounded<<1 > mLargeAllocSpace)
             mLargeAllocSpace = rounded<<1;
       }
@@ -2492,7 +2492,7 @@ class GlobalAllocator
          GlobalAllocator *mAlloc;
       public:
          AdjustPointer(GlobalAllocator *inAlloc) : mAlloc(inAlloc) {  }
-      
+
          void visitObject(hx::Object **ioPtr)
          {
             if ( ((*(unsigned int **)ioPtr)[-1]) == IMMIX_OBJECT_HAS_MOVED )
@@ -2631,7 +2631,7 @@ class GlobalAllocator
 
    }
    #endif // } defined(HXCPP_VISIT_ALLOCS)
- 
+
    void *GetIDObject(int inIndex)
    {
       AutoLock lock(*gSpecialObjectLock);
@@ -2767,7 +2767,7 @@ class GlobalAllocator
          {
             ThreadPoolAutoLock l(sThreadPoolLock);
             int count = 0;
- 
+
             // May be woken multiple times if sRunningThreads is set to 0 then 1 before we sleep
             sThreadSleeping[inId] = true;
             // Spurious wake?
@@ -3039,7 +3039,7 @@ class GlobalAllocator
       sgAllocsSinceLastSpam = 0;
       #endif
 
-      HX_STACK_FRAME("GC", "collect", 0, "GC::collect", __FILE__, __LINE__,0)
+      HX_STACK_FRAME("GC", "collect", 0, "GC::collect", __FILE__, __LINE__, 5, 0)
       #ifdef SHOW_MEM_EVENTS
       int here = 0;
       GCLOG("=== Collect === %p\n",&here);
@@ -3201,7 +3201,7 @@ class GlobalAllocator
       int mem = stats.rowsInUse<<IMMIX_LINE_BITS;
       int targetFree = std::max(hx::sgMinimumFreeSpace, mem/100 *hx::sgTargetFreeSpacePercentage );
       sWorkingMemorySize = std::max( mem + targetFree, hx::sgMinimumWorkingMemory);
- 
+
       // Large alloc target
       int blockSize =  mAllBlocks.size()<<IMMIX_BLOCK_BITS;
       if (blockSize > mLargeAllocSpace)
@@ -3903,7 +3903,7 @@ void SetTopOfStack(int *inTop,bool inForce)
 void *InternalNew(int inSize,bool inIsObject)
 {
    //HX_STACK_FRAME("GC", "new", 0, "GC::new", "src/hx/GCInternal.cpp", __LINE__, 0)
-   HX_STACK_FRAME("GC", "new", 0, "GC::new", "src/hx/GCInternal.cpp", inSize, 0)
+   HX_STACK_FRAME("GC", "new", 0, "GC::new", "src/hx/GCInternal.cpp", inSize, 5, 0)
 
    #ifdef HXCPP_DEBUG
    if (sgSpamCollects && sgAllocsSinceLastSpam>=sgSpamCollects)
@@ -3971,7 +3971,7 @@ void *InternalRealloc(void *inData,int inSize)
    if (inData==0)
       return hx::InternalNew(inSize,false);
 
-   HX_STACK_FRAME("GC", "realloc", 0, "GC::relloc", __FILE__ , __LINE__, 0)
+   HX_STACK_FRAME("GC", "realloc", 0, "GC::relloc", __FILE__ , __LINE__, 5, 0)
 
    #ifdef HXCPP_DEBUG
    if (sgSpamCollects && sgAllocsSinceLastSpam>=sgSpamCollects)
@@ -4190,4 +4190,3 @@ unsigned int __hxcpp_obj_hash(Dynamic inObj)
 
 
 void DummyFunction(void *inPtr) { }
-

From 6f69cb1be17dc42fd8faed9bf19dc14219c20f88 Mon Sep 17 00:00:00 2001
From: mike <mike@eduroam-169-233-223-158.ucsc.edu>
Date: Mon, 8 Feb 2016 12:18:41 -0800
Subject: [PATCH 07/14] Modified FindFileLineBreakpoint to accept only line
 numbers

---
 src/hx/Debug.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/hx/Debug.cpp b/src/hx/Debug.cpp
index 2fd8b1fcc..f4e2b1acc 100644
--- a/src/hx/Debug.cpp
+++ b/src/hx/Debug.cpp
@@ -2004,13 +2004,19 @@ class Breakpoints
       //printf("FindFileLineBreakpoint(), inFrame.columnNumber = %d\n", inFrame->columnNumber);
       for (int i = 0; i < mBreakpointCount; i++)
       {
-         Breakpoint &breakpoint = mBreakpoints[i];
-         if (breakpoint.isFileLine && breakpoint.hash==inFrame->fileHash &&
-             (breakpoint.lineNumber == inFrame->lineNumber) && (breakpoint.columnNumber == inFrame->columnNumber) &&
-             !strcmp(breakpoint.fileOrClassName.c_str(),inFrame->fileName) ) {
-            printf("Breakpoint reached at %s:%d:%d\n", inFrame->fileName, inFrame->lineNumber, inFrame->columnNumber);
-            return breakpoint.number;
-          }
+        Breakpoint &breakpoint = mBreakpoints[i];
+        bool hasCol = true;
+        if(breakpoint.columnNumber == -1) hasCol = false;
+        //Breakpoint &breakpoint = mBreakpoints[i];
+        bool lineCondition = (breakpoint.isFileLine && breakpoint.hash==inFrame->fileHash &&
+            (breakpoint.lineNumber == inFrame->lineNumber) &&
+            !strcmp(breakpoint.fileOrClassName.c_str(),inFrame->fileName) );
+
+        if(hasCol && lineCondition && (breakpoint.columnNumber == inFrame->columnNumber)) {
+          return breakpoint.number;
+        }else if((!hasCol) && lineCondition) {
+          return breakpoint.number;
+        }
       }
       return -1;
    }

From 1f324adc228bf39a427e8b900ba1cc164e6a59c8 Mon Sep 17 00:00:00 2001
From: mike <mike@Sauron-2.local>
Date: Mon, 15 Feb 2016 17:37:13 -0800
Subject: [PATCH 08/14] Column number print

---
 include/hx/Debug.h |  3 +++
 src/hx/Anon.cpp    |  3 +--
 src/hx/Debug.cpp   | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/include/hx/Debug.h b/include/hx/Debug.h
index 8829dd911..2cb6dcecd 100644
--- a/include/hx/Debug.h
+++ b/include/hx/Debug.h
@@ -130,6 +130,8 @@ class StackFrame
          fullName(inFullName), fileName(inFileName),
          #ifdef HXCPP_STACK_LINE
          firstLineNumber(inLineNumber),
+         //CS116
+         firstColumnNumber(inColumnNumber),
          #endif
          #ifdef HXCPP_STACK_VARS
          variables(0),
@@ -138,6 +140,7 @@ class StackFrame
     {
          #ifdef HXCPP_STACK_LINE
          lineNumber = firstLineNumber;
+         columnNumber = firstColumnNumber;
          #endif
        __hxcpp_register_stack_frame(this);
     }
diff --git a/src/hx/Anon.cpp b/src/hx/Anon.cpp
index 9310e1078..c19e79705 100644
--- a/src/hx/Anon.cpp
+++ b/src/hx/Anon.cpp
@@ -139,6 +139,7 @@ Anon SourceInfo(String inFile, int inLine, String inClass, String inMethod)
    Anon result = Anon_obj::Create();
    result->Add(HX_CSTRING("fileName"),inFile);
    result->Add(HX_CSTRING("lineNumber"),inLine);
+   //CS116 result->Add(HX_CSTRING("columnNumber"),inColumn);
    result->Add(HX_CSTRING("className"),inClass);
    result->Add(HX_CSTRING("methodName"),inMethod);
    return result;
@@ -155,5 +156,3 @@ bool __hxcpp_anon_remove(Dynamic inObj,String inKey)
       return __string_hash_remove(*map,inKey);
    return false;
 }
-
-
diff --git a/src/hx/Debug.cpp b/src/hx/Debug.cpp
index f4e2b1acc..32f9a1778 100644
--- a/src/hx/Debug.cpp
+++ b/src/hx/Debug.cpp
@@ -39,6 +39,8 @@ using namespace Windows::System::Threading;
 const char* EXTERN_CLASS_NAME = "extern";
 #endif
 
+#define NO_COL_SPEC -1
+
 // These should implement write and read memory barrier, but since there are
 // no obvious portable implementations, they are currently left unimplemented
 static void write_memory_barrier()
@@ -1494,6 +1496,7 @@ class CallStack
    {
         Dynamic ret = g_newStackFrameFunction
             (String(frame->fileName), String(frame->lineNumber),
+             String(frame->columnNumber),
              String(frame->className), String(frame->functionName));
 
         // Don't do parameters for now
@@ -1729,6 +1732,7 @@ class Breakpoints
                 (gStepThread == stack->GetThreadNumber())) {
                 if (gStepType == STEP_OVER) {
                     if (stack->GetDepth() <= gStepLevel) {
+                        //printf("Break immediate: stack->GetDepth=%d, gStepLevel=%d\n", stack->GetDepth(), gStepLevel);
                         breakStatus = STATUS_STOPPED_BREAK_IMMEDIATE;
                     }
                 }
@@ -1909,6 +1913,7 @@ class Breakpoints
 #endif
    }
 
+
    // Copies breakpoints from toCopy except for number
    Breakpoints(const Breakpoints *toCopy, int number)
         : mRefCount(1)
@@ -2001,12 +2006,12 @@ class Breakpoints
    //CS116 - We added columnNumber conditional.
    int FindFileLineBreakpoint(StackFrame *inFrame)
    {
-      //printf("FindFileLineBreakpoint(), inFrame.columnNumber = %d\n", inFrame->columnNumber);
       for (int i = 0; i < mBreakpointCount; i++)
       {
         Breakpoint &breakpoint = mBreakpoints[i];
-        bool hasCol = true;
-        if(breakpoint.columnNumber == -1) hasCol = false;
+        bool hasCol = (breakpoint.columnNumber != NO_COL_SPEC);
+        if(hasCol) {
+        }
         //Breakpoint &breakpoint = mBreakpoints[i];
         bool lineCondition = (breakpoint.isFileLine && breakpoint.hash==inFrame->fileHash &&
             (breakpoint.lineNumber == inFrame->lineNumber) &&

From e5bab75e4a3a41ae94e58bc242543fdad2b20500 Mon Sep 17 00:00:00 2001
From: mike <mike@Sauron-2.local>
Date: Mon, 15 Feb 2016 21:49:42 -0800
Subject: [PATCH 09/14] Touchups

---
 src/hx/Debug.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/hx/Debug.cpp b/src/hx/Debug.cpp
index 32f9a1778..5364b14e0 100644
--- a/src/hx/Debug.cpp
+++ b/src/hx/Debug.cpp
@@ -2010,8 +2010,6 @@ class Breakpoints
       {
         Breakpoint &breakpoint = mBreakpoints[i];
         bool hasCol = (breakpoint.columnNumber != NO_COL_SPEC);
-        if(hasCol) {
-        }
         //Breakpoint &breakpoint = mBreakpoints[i];
         bool lineCondition = (breakpoint.isFileLine && breakpoint.hash==inFrame->fileHash &&
             (breakpoint.lineNumber == inFrame->lineNumber) &&

From eac16ebaab9bd20bf81bca29562ba2591041f2a2 Mon Sep 17 00:00:00 2001
From: mike <mike@eduroam-169-233-244-127.ucsc.edu>
Date: Thu, 18 Feb 2016 13:32:36 -0800
Subject: [PATCH 10/14] build.mod

---
 build.mod | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 build.mod

diff --git a/build.mod b/build.mod
new file mode 100644
index 000000000..5e40bfdad
--- /dev/null
+++ b/build.mod
@@ -0,0 +1,7 @@
+cd tools/hxcpp 
+haxe compile.hxml
+cd ../build
+haxe compile.hxml
+cd ../../project
+neko build.n clean
+neko build.n

From a4bc997daef6eea55b3c3354a6ad2832ae0adb91 Mon Sep 17 00:00:00 2001
From: mike <mike@eduroam-169-233-247-24.ucsc.edu>
Date: Mon, 7 Mar 2016 09:56:49 -0800
Subject: [PATCH 11/14] Next line functionality

---
 include/hx/Debug.h |   4 +++
 project/build.n    | Bin 31213 -> 36093 bytes
 src/hx/Debug.cpp   |  64 ++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/include/hx/Debug.h b/include/hx/Debug.h
index 2cb6dcecd..85c2237e3 100644
--- a/include/hx/Debug.h
+++ b/include/hx/Debug.h
@@ -502,6 +502,8 @@ void __hxcpp_dbg_deleteBreakpoint(int number);
 void __hxcpp_dbg_breakNow(bool wait);
 void __hxcpp_dbg_continueThreads(int threadNumber, int count);
 void __hxcpp_dbg_stepThread(int threadNumber, int stepType, int stepCount);
+void __hxcpp_dbg_stepThreadLine(int threadNumber, int stepType);
+void __hxcpp_dbg_setPrint(bool in);
 Array<Dynamic> __hxcpp_dbg_getStackVariables(int threadNumber,
                                              int stackFrameNumber,
                                              bool unsafe,
@@ -560,6 +562,8 @@ inline void __hxcpp_dbg_deleteBreakpoint(int) { }
 inline void __hxcpp_dbg_breakNow(bool) { }
 inline void __hxcpp_dbg_continueThreads(int, int) { }
 inline void __hxcpp_dbg_stepThread(int, int, int) { }
+inline void __hxcpp_dbg_stepThreadLine(int, int) { }
+void __hxcpp_dbg_setPrint(bool) { }
 inline Array<Dynamic> __hxcpp_dbg_getStackVariables(int, int, bool, Dynamic)
     { return Array_obj< String>::__new(); }
 inline Dynamic __hxcpp_dbg_getStackVariableValue(int, int, String, bool,
diff --git a/project/build.n b/project/build.n
index f3e630a538dbd6172579a33ab6fb37f273351525..828a9304d7c5e94450bf05993ac656900268a4f6 100644
GIT binary patch
delta 13063
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

delta 9209
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

diff --git a/src/hx/Debug.cpp b/src/hx/Debug.cpp
index 5364b14e0..6aaf6aa16 100644
--- a/src/hx/Debug.cpp
+++ b/src/hx/Debug.cpp
@@ -722,6 +722,10 @@ class CallStack
 {
 public:
 
+    static void setPrint(bool in) {
+      printf("setPrint()\n");
+    }
+
     // Gets the call stack of the calling thread
     static CallStack *GetCallerCallStack()
     {
@@ -870,8 +874,45 @@ class CallStack
                 break;
             }
         }
+    }
 
-        gMutex.Unlock();
+    static CallStack* getStack() {
+      std::list<CallStack *>::iterator iter = gList.begin();
+      CallStack *stack = *iter;
+
+      return stack;
+    }
+
+    static std::vector<StackFrame*> getStackFrames(CallStack* stack) {
+      return stack->mStackFrames;
+    }
+
+    static void StepOneThreadLine(int threadNumber, int &stackLevel, int start_line)
+    {
+      gMutex.Lock();
+
+      std::list<CallStack *>::iterator iter = gList.begin();
+      CallStack* stack = *iter++;
+
+      while (iter != gList.end()) {
+
+          if (stack->mThreadNumber == threadNumber) {
+              stackLevel = stack->mStackFrames.size() - 1;
+              while(1) {
+                int current_line = stack->mStackFrames[stackLevel]->lineNumber;
+                // != to account for loops and lines not lesser value than
+                //starting line.
+                if((current_line != start_line)) {
+                  break;
+                }
+                stack->Continue(1);
+              }
+              break;
+          }
+          stack = *iter++;
+      }
+
+      gMutex.Unlock();
     }
 
     static void GetCurrentCallStackAsStrings(Array<String> result, bool skipLast)
@@ -1705,6 +1746,19 @@ class Breakpoints
         CallStack::StepOneThread(threadNumber, gStepLevel);
     }
 
+    static void StepThreadLine(int threadNumber, StepType stepType) {
+      gStepThread = threadNumber;
+      gStepType = stepType;
+      gStepCount = 1;
+
+      CallStack* stack = CallStack::getStack();
+      std::vector<StackFrame*> frames =  CallStack::getStackFrames(stack);
+
+      int start_line = frames[frames.size()-1]->lineNumber;
+
+      CallStack::StepOneThreadLine(threadNumber, gStepLevel, start_line);
+    }
+
     // Note that HandleBreakpoints is called immediately after a read memory
     // barrier by the HX_STACK_LINE macro
     static void HandleBreakpoints()
@@ -2215,6 +2269,14 @@ void __hxcpp_dbg_stepThread(int threadNumber, int stepType, int stepCount)
                                 stepCount);
 }
 
+void __hxcpp_dbg_stepThreadLine(int threadNumber, int stepType) {
+
+  hx::Breakpoints::StepThreadLine(threadNumber, (hx::StepType) stepType);
+}
+
+void __hxcpp_dbg_setPrint(bool in) {
+  hx::CallStack::setPrint(in);
+}
 
 Array<Dynamic> __hxcpp_dbg_getStackVariables(int threadNumber,
                                              int stackFrameNumber,

From 202c837bda6f24176a7c51debd5fd8993ffab854 Mon Sep 17 00:00:00 2001
From: mike <mike@Sauron-2.local>
Date: Tue, 8 Mar 2016 20:55:42 -0800
Subject: [PATCH 12/14] NextLine now accepts an arbitrary number of of lines.

---
 include/hx/Debug.h |  4 ++--
 src/hx/Debug.cpp   | 26 +++++++++++++++++---------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/include/hx/Debug.h b/include/hx/Debug.h
index 85c2237e3..0eb54a65e 100644
--- a/include/hx/Debug.h
+++ b/include/hx/Debug.h
@@ -502,7 +502,7 @@ void __hxcpp_dbg_deleteBreakpoint(int number);
 void __hxcpp_dbg_breakNow(bool wait);
 void __hxcpp_dbg_continueThreads(int threadNumber, int count);
 void __hxcpp_dbg_stepThread(int threadNumber, int stepType, int stepCount);
-void __hxcpp_dbg_stepThreadLine(int threadNumber, int stepType);
+void __hxcpp_dbg_stepThreadLine(int threadNumber, int stepType, int stepCount);
 void __hxcpp_dbg_setPrint(bool in);
 Array<Dynamic> __hxcpp_dbg_getStackVariables(int threadNumber,
                                              int stackFrameNumber,
@@ -562,7 +562,7 @@ inline void __hxcpp_dbg_deleteBreakpoint(int) { }
 inline void __hxcpp_dbg_breakNow(bool) { }
 inline void __hxcpp_dbg_continueThreads(int, int) { }
 inline void __hxcpp_dbg_stepThread(int, int, int) { }
-inline void __hxcpp_dbg_stepThreadLine(int, int) { }
+inline void __hxcpp_dbg_stepThreadLine(int, int, int) { }
 void __hxcpp_dbg_setPrint(bool) { }
 inline Array<Dynamic> __hxcpp_dbg_getStackVariables(int, int, bool, Dynamic)
     { return Array_obj< String>::__new(); }
diff --git a/src/hx/Debug.cpp b/src/hx/Debug.cpp
index 6aaf6aa16..41c8ffadf 100644
--- a/src/hx/Debug.cpp
+++ b/src/hx/Debug.cpp
@@ -723,7 +723,6 @@ class CallStack
 public:
 
     static void setPrint(bool in) {
-      printf("setPrint()\n");
     }
 
     // Gets the call stack of the calling thread
@@ -887,23 +886,32 @@ class CallStack
       return stack->mStackFrames;
     }
 
-    static void StepOneThreadLine(int threadNumber, int &stackLevel, int start_line)
+    static void StepOneThreadLine(int threadNumber, int &stackLevel, int start_line, int count)
     {
       gMutex.Lock();
 
       std::list<CallStack *>::iterator iter = gList.begin();
       CallStack* stack = *iter++;
+      int prev_line = start_line;
+      int c = -1;
+      int current_line = -1;
 
       while (iter != gList.end()) {
 
           if (stack->mThreadNumber == threadNumber) {
               stackLevel = stack->mStackFrames.size() - 1;
               while(1) {
-                int current_line = stack->mStackFrames[stackLevel]->lineNumber;
+                prev_line = current_line;
+                current_line = stack->mStackFrames[stackLevel]->lineNumber;
+                if(current_line != prev_line) {
+                  c++;
+                }
                 // != to account for loops and lines not lesser value than
                 //starting line.
                 if((current_line != start_line)) {
-                  break;
+                  if(c == count) {
+                    break;
+                  }
                 }
                 stack->Continue(1);
               }
@@ -911,7 +919,6 @@ class CallStack
           }
           stack = *iter++;
       }
-
       gMutex.Unlock();
     }
 
@@ -1746,7 +1753,7 @@ class Breakpoints
         CallStack::StepOneThread(threadNumber, gStepLevel);
     }
 
-    static void StepThreadLine(int threadNumber, StepType stepType) {
+    static void StepThreadLine(int threadNumber, StepType stepType, int stepCount) {
       gStepThread = threadNumber;
       gStepType = stepType;
       gStepCount = 1;
@@ -1756,7 +1763,7 @@ class Breakpoints
 
       int start_line = frames[frames.size()-1]->lineNumber;
 
-      CallStack::StepOneThreadLine(threadNumber, gStepLevel, start_line);
+      CallStack::StepOneThreadLine(threadNumber, gStepLevel, start_line, stepCount);
     }
 
     // Note that HandleBreakpoints is called immediately after a read memory
@@ -2269,9 +2276,10 @@ void __hxcpp_dbg_stepThread(int threadNumber, int stepType, int stepCount)
                                 stepCount);
 }
 
-void __hxcpp_dbg_stepThreadLine(int threadNumber, int stepType) {
+void __hxcpp_dbg_stepThreadLine(int threadNumber, int stepType, int stepCount) {
 
-  hx::Breakpoints::StepThreadLine(threadNumber, (hx::StepType) stepType);
+  hx::Breakpoints::StepThreadLine(threadNumber, (hx::StepType) stepType,
+                                  stepCount);
 }
 
 void __hxcpp_dbg_setPrint(bool in) {

From fc09b4c562bf44d44ddc02d2c72a3efd75fc0e36 Mon Sep 17 00:00:00 2001
From: mike <mike@eduroam-169-233-194-115.ucsc.edu>
Date: Thu, 10 Mar 2016 12:09:06 -0800
Subject: [PATCH 13/14] NextLine functionality

---
 include/hx/Debug.h | 2 ++
 src/hx/Debug.cpp   | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/include/hx/Debug.h b/include/hx/Debug.h
index 0eb54a65e..209e6f5f4 100644
--- a/include/hx/Debug.h
+++ b/include/hx/Debug.h
@@ -504,6 +504,7 @@ void __hxcpp_dbg_continueThreads(int threadNumber, int count);
 void __hxcpp_dbg_stepThread(int threadNumber, int stepType, int stepCount);
 void __hxcpp_dbg_stepThreadLine(int threadNumber, int stepType, int stepCount);
 void __hxcpp_dbg_setPrint(bool in);
+bool __hxcpp_dbg_getPrint();
 Array<Dynamic> __hxcpp_dbg_getStackVariables(int threadNumber,
                                              int stackFrameNumber,
                                              bool unsafe,
@@ -564,6 +565,7 @@ inline void __hxcpp_dbg_continueThreads(int, int) { }
 inline void __hxcpp_dbg_stepThread(int, int, int) { }
 inline void __hxcpp_dbg_stepThreadLine(int, int, int) { }
 void __hxcpp_dbg_setPrint(bool) { }
+bool __hxcpp_dbg_getPrint() { }
 inline Array<Dynamic> __hxcpp_dbg_getStackVariables(int, int, bool, Dynamic)
     { return Array_obj< String>::__new(); }
 inline Dynamic __hxcpp_dbg_getStackVariableValue(int, int, String, bool,
diff --git a/src/hx/Debug.cpp b/src/hx/Debug.cpp
index 41c8ffadf..6e502eb68 100644
--- a/src/hx/Debug.cpp
+++ b/src/hx/Debug.cpp
@@ -1586,6 +1586,7 @@ class CallStack
 /* static */ MyMutex CallStack::gMutex;
 /* static */ std::map<int, CallStack *> CallStack::gMap;
 /* static */ std::list<CallStack *> CallStack::gList;
+bool printStatus;
 
 #ifdef HXCPP_DEBUGGER
 class Breakpoints
@@ -2283,7 +2284,11 @@ void __hxcpp_dbg_stepThreadLine(int threadNumber, int stepType, int stepCount) {
 }
 
 void __hxcpp_dbg_setPrint(bool in) {
-  hx::CallStack::setPrint(in);
+  hx::printStatus = in;
+}
+
+bool __hxcpp_dbg_getPrint() {
+  return hx::printStatus;
 }
 
 Array<Dynamic> __hxcpp_dbg_getStackVariables(int threadNumber,

From f36fd284bd1443e5e8f44cbc0158d7052d01a7c1 Mon Sep 17 00:00:00 2001
From: mike <mike@Sauron-2.local>
Date: Fri, 11 Mar 2016 00:45:14 -0800
Subject: [PATCH 14/14] Fixed prompt

---
 include/hx/Debug.h | 4 ++++
 src/hx/Debug.cpp   | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/include/hx/Debug.h b/include/hx/Debug.h
index 209e6f5f4..e86fe18d1 100644
--- a/include/hx/Debug.h
+++ b/include/hx/Debug.h
@@ -504,6 +504,8 @@ void __hxcpp_dbg_continueThreads(int threadNumber, int count);
 void __hxcpp_dbg_stepThread(int threadNumber, int stepType, int stepCount);
 void __hxcpp_dbg_stepThreadLine(int threadNumber, int stepType, int stepCount);
 void __hxcpp_dbg_setPrint(bool in);
+bool __hxcpp_dbg_getPrintReady();
+void __hxcpp_dbg_setPrintReady(bool in);
 bool __hxcpp_dbg_getPrint();
 Array<Dynamic> __hxcpp_dbg_getStackVariables(int threadNumber,
                                              int stackFrameNumber,
@@ -565,6 +567,8 @@ inline void __hxcpp_dbg_continueThreads(int, int) { }
 inline void __hxcpp_dbg_stepThread(int, int, int) { }
 inline void __hxcpp_dbg_stepThreadLine(int, int, int) { }
 void __hxcpp_dbg_setPrint(bool) { }
+void __hxcpp_dbg_setPrintReady(bool) { }
+bool __hxcpp_dbg_getPrintReady() { }
 bool __hxcpp_dbg_getPrint() { }
 inline Array<Dynamic> __hxcpp_dbg_getStackVariables(int, int, bool, Dynamic)
     { return Array_obj< String>::__new(); }
diff --git a/src/hx/Debug.cpp b/src/hx/Debug.cpp
index 6e502eb68..a2e834e69 100644
--- a/src/hx/Debug.cpp
+++ b/src/hx/Debug.cpp
@@ -1587,6 +1587,7 @@ class CallStack
 /* static */ std::map<int, CallStack *> CallStack::gMap;
 /* static */ std::list<CallStack *> CallStack::gList;
 bool printStatus;
+bool PrintReady;
 
 #ifdef HXCPP_DEBUGGER
 class Breakpoints
@@ -2291,6 +2292,13 @@ bool __hxcpp_dbg_getPrint() {
   return hx::printStatus;
 }
 
+void __hxcpp_dbg_setPrintReady(bool in) {
+  hx::PrintReady = in;
+}
+
+bool __hxcpp_dbg_getPrintReady() {
+  return hx::PrintReady;
+}
 Array<Dynamic> __hxcpp_dbg_getStackVariables(int threadNumber,
                                              int stackFrameNumber,
                                              bool unsafe,