Sort-of improve multi-line editor when in vi mode.

[cycript.git] / Syntax.hpp

diff --git a/Syntax.hpp b/Syntax.hpp
index d278729c38beb598bce6b3a93ea17a5a6c1e4395..a83659d7e6bd53ab15cbb60dee0d31fef46ace72 100644 (file)
--- a/Syntax.hpp
+++ b/Syntax.hpp
@@ -78,15 +78,15 @@ struct CYOutput {
         _assert(out_.sputc(value) != EOF);
         recent_ = indent_;
         if (value == '\n')
-            position_.lines(1);
+            position_.Lines(1);
         else
-            position_.columns(1);
+            position_.Columns(1);
     }
 
     _finline void operator ()(const char *data, std::streamsize size) {
         _assert(out_.sputn(data, size) == size);
         recent_ = indent_;
-        position_.columns(size);
+        position_.Columns(size);
     }
 
     _finline void operator ()(const char *data) {
@@ -1191,19 +1191,17 @@ struct CYVar :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYLetStatement :
+struct CYLet :
     CYStatement
 {
     CYDeclarations *declarations_;
-    CYStatement *code_;
 
-    CYLetStatement(CYDeclarations *declarations, CYStatement *code) :
-        declarations_(declarations),
-        code_(code)
+    CYLet(CYDeclarations *declarations) :
+        declarations_(declarations)
     {
     }
 
-    CYCompact(Long)
+    CYCompact(None)
 
     virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;