basic unicode support

Task #127 - provide basic unicode support in cyacas
grzegorzmazur · Sep 27, 2015 · 0ac7f6a · 0ac7f6a
1 parent 8ff4b8c
commit 0ac7f6a
Show file tree

Hide file tree

Showing 18 changed files with 267 additions and 313 deletions.
diff --git a/include/yacas/commandline.h b/include/yacas/commandline.h
@@ -20,10 +20,11 @@
 
 #include "lispstring.h"
 #include "yacasbase.h"
+#include "utf8.h"
 
 enum ESpecialChars
 {
-    eDelete     = 0x1000,
+    eDelete     = utf8::internal::CODE_POINT_MAX + 1,
     eBackSpace,
     eLeft,
     eRight,
@@ -90,7 +91,7 @@ class CCommandLine : public YacasBase
   /** return a key press, which is either an ascii value, or one
    * of the values specified in ESpecialChars
    */
-  virtual LispInt GetKey() = 0;
+  virtual char32_t GetKey() = 0;
   /// Go to the next line on the console (carriage return/line feed).
   virtual void NewLine()   = 0;
   /** Show the current line (in iSubLine), with the required prompt,

diff --git a/include/yacas/lispio.h b/include/yacas/lispio.h
@@ -6,13 +6,9 @@
 #ifndef YACAS_LISPIO_H
 #define YACAS_LISPIO_H
 
-#include "yacasbase.h"
-
 #include <cstddef>
 #include <string>
 
-// Hope this forward declaration doesn't screw us over...
-class InputDirectories;
 class InputStatus
 {
 public:
@@ -73,12 +69,12 @@ class LispInput
   virtual ~LispInput() = default;
 
   /// Return the next character in the file
-  virtual LispChar Next() = 0;
+  virtual char32_t Next() = 0;
 
   /** Peek at the next character in the file, without advancing the file
    *  pointer.
    */
-  virtual LispChar Peek() = 0;
+  virtual char32_t Peek() = 0;
 
   virtual const InputStatus& Status() const {return iStatus;};
 

diff --git a/include/yacas/platfileio.h b/include/yacas/platfileio.h
@@ -2,7 +2,6 @@
 #define YACAS_PLATFILEIO_H
 
 #include "noncopyable.h"
-#include "yacasbase.h"
 
 #include <fstream>
 #include <iostream>
@@ -21,41 +20,25 @@ class LispLocalFile: NonCopyable {
     LispEnvironment& environment;
 };
 
-
-class StdFileInput : public LispInput
-{
+class StdFileInput : public LispInput {
 public:
-  virtual LispChar Next();
-  virtual LispChar Peek();
-  virtual bool EndOfStream() const;
-  void Rewind();
-  virtual std::size_t Position() const;
-  virtual void SetPosition(std::size_t aPosition);
-
-protected:
     StdFileInput(std::istream&, InputStatus& aStatus);
     StdFileInput(LispLocalFile& aFile,InputStatus& aStatus);
 
-    std::istream& stream;
-};
-
-
-/** CachedStdFileInput : same as StdFileInput, but with caching
- * for speed */
-class CachedStdFileInput: public StdFileInput, NonCopyable {
-public:
-    CachedStdFileInput(LispLocalFile& aFile,InputStatus& aStatus);
-
-    LispChar Next();
-    LispChar Peek();
-    bool EndOfStream() const;
-    void Rewind();
-    std::size_t Position() const;
-    void SetPosition(std::size_t aPosition);
-
+    char32_t Next() override;
+    char32_t Peek() override;
+    bool EndOfStream() const override;
+    virtual void Rewind();
+    std::size_t Position() const override;
+    void SetPosition(std::size_t) override;
+
 private:
-    std::vector<LispChar> _buf;
-    std::size_t iCurrentPos;
+    void _get() const;
+
+    std::istream& _stream;
+    std::size_t _position;
+    mutable bool _cp_ready;
+    mutable char32_t _cp;
 };
 
 class StdUserInput: public StdFileInput {
@@ -66,21 +49,6 @@ class StdUserInput: public StdFileInput {
     }
 };
 
-class CachedStdUserInput: public StdUserInput {
-public:
-    CachedStdUserInput(InputStatus& aStatus);
-
-    virtual LispChar Next();
-    virtual LispChar Peek();
-    virtual bool EndOfStream() const;
-    void Rewind();
-    virtual std::size_t Position() const;
-
-private:
-    LispString iBuffer;
-    std::size_t iCurrentPos;
-};
-
 
 std::string InternalFindFile(const LispChar* fname, const std::vector<std::string>& dirs);
 

diff --git a/include/yacas/stdcommandline.h b/include/yacas/stdcommandline.h
@@ -8,12 +8,12 @@
 class CStdCommandLine : public CCommandLine
 {
 public:
-    void ReadLine(const std::string& prompt);
+    void ReadLine(const std::string& prompt) override;
 public:
-    LispInt GetKey();
-    void NewLine();
-    void ShowLine(const std::string& prompt, unsigned cursor);
-    void Pause();
+    char32_t GetKey() override;
+    void NewLine() override;
+    void ShowLine(const std::string& prompt, unsigned cursor) override;
+    void Pause() override;
 };
 
 

diff --git a/include/yacas/stringio.h b/include/yacas/stringio.h
@@ -5,22 +5,23 @@
 #ifndef YACAS_STRINGIO_H
 #define YACAS_STRINGIO_H
 
-#include "yacasbase.h"
 #include "lispio.h"
-#include "lispstring.h"
+#include "utf8.h"
+
+#include <string>
 
 class StringInput : public LispInput
 {
 public:
-    StringInput(const std::string& aString, InputStatus& aStatus);
-    virtual LispChar Next();
-    virtual LispChar Peek();
-    virtual bool EndOfStream() const;
-    virtual std::size_t Position() const;
-    virtual void SetPosition(std::size_t aPosition);
+    StringInput(const std::string&, InputStatus&);
+    char32_t Next() override;
+    char32_t Peek() override;
+    bool EndOfStream() const override;
+    std::size_t Position() const override;
+    void SetPosition(std::size_t aPosition) override;
 protected:
-    std::string iString;
-    std::size_t iCurrent;
+    std::string _string;
+    std::string::const_iterator _current;
 };
 
 #endif

diff --git a/include/yacas/unixcommandline.h b/include/yacas/unixcommandline.h
@@ -15,11 +15,11 @@ class CUnixCommandLine : public CCommandLine
     CUnixCommandLine();
     ~CUnixCommandLine();
 
-    LispInt GetKey();
-    void NewLine();
-    void ShowLine(const std::string& prompt, unsigned cursor);
-    void Pause();
-    void MaxHistoryLinesSaved(std::size_t);
+    char32_t GetKey() override;
+    void NewLine() override;
+    void ShowLine(const std::string& prompt, unsigned cursor) override;
+    void Pause() override;
+    void MaxHistoryLinesSaved(std::size_t) override;
 
 private:
     unsigned char term_chars[NCCS];

diff --git a/include/yacas/win32commandline.h b/include/yacas/win32commandline.h
@@ -11,11 +11,11 @@ class CWin32CommandLine : public CCommandLine
     CWin32CommandLine();
     ~CWin32CommandLine();
 
-    LispInt GetKey();
-    void NewLine();
-    void ShowLine(const std::string& prompt, unsigned cursor);
-    void Pause();
-    void MaxHistoryLinesSaved(std::size_t);
+    char32_t GetKey() override;
+    void NewLine() override;
+    void ShowLine(const std::string& prompt, unsigned cursor) override;
+    void Pause() override;
+    void MaxHistoryLinesSaved(std::size_t) override;
 
 private:
     void color_print(const std::string& str, WORD text_attrib);

diff --git a/include/yacas/yacas.h b/include/yacas/yacas.h
@@ -56,7 +56,7 @@ class DefaultYacasEnvironment: NonCopyable
   LispEnvironment iEnvironment;
 
 public:
-  CachedStdUserInput input;
+  StdUserInput input;
 };