quote & escape handling; fixes; atom list; select & search atom

Author: rochus-keller

LICENSE.GPL2

@@ -27,7 +27,7 @@
 #include <QtDebug>
 using namespace Lisp;
 
-static QHash<QByteArray,QByteArray> d_symbols;
+static QHash<QByteArray,QByteArray> s_symbols;
 
 bool Token::isValid() const
 {
@@ -77,21 +77,36 @@ QByteArray Token::getSymbol(const QByteArray& str)
 {
     if( str.isEmpty() )
         return str;
-    QByteArray& sym = d_symbols[str];
+    QByteArray& sym = s_symbols[str];
     if( sym.isEmpty() )
         sym = str;
     return sym;
 }
 
+QStringList Token::getAllSymbols()
+{
+    QHash<QByteArray,QByteArray>::const_iterator i;
+    QStringList res;
+    for( i = s_symbols.begin(); i != s_symbols.end(); ++i )
+        res.append( QString::fromUtf8(i.key()) );
+    res.sort(Qt::CaseInsensitive);
+    return res;
+}
+
 char Lexer::readc()
 {
+    static char last = 0;
     char res;
     if( in && !in->atEnd() && in->getChar(&res) )
     {
         if( res == '\r' )
-            res = '\n';
+            res = '\n'; // immediatedly convert to \n
         else if( res == 0 || (!isprint(res) && !isspace(res)) )
+        {
+            if( last == '%' )
+                return ' '; // TODO: we need another solution, maybe (CHARACTER res); TODO: sync with Navigator::decode
             return readc(); // ignore all clutter
+        }
         if( res == '\n' )
         {
             pos.row++;
@@ -101,6 +116,7 @@ char Lexer::readc()
         if( res == 0 )
             res = -1;
         Q_ASSERT(isspace(res) || isprint(res));
+        last = res;
         return res;
     }else
     {
@@ -119,8 +135,10 @@ void Lexer::ungetc(char c)
         return;
     Q_ASSERT(isspace(c) || isprint(c));
 
-    if( in && c && !isspace(c) ) // don't unget whitespace
+    if( in && c )
     {
+        if( c == '\n' )
+            c = ' ';
         pos.col--;
         in->ungetChar(c);
     }
@@ -132,7 +150,7 @@ void Lexer::ungetstr(const QByteArray& str)
         ungetc(str[i]);
 }
 
-Lexer::Lexer(QObject* parent):QObject(parent),in(0),emitComments(false),packed(true)
+Lexer::Lexer(QObject* parent):QObject(parent),in(0),emitComments(false),packed(true),inQuote(false)
 {
 
 }
@@ -262,6 +280,16 @@ QList<Token> Lexer::tokens(const QByteArray& code, const QString& path)
     return res;
 }
 
+void Lexer::startQuote()
+{
+    inQuote = true;
+}
+
+void Lexer::endQuote()
+{
+    inQuote = false;
+}
+
 Token Lexer::token(TokenType tt, int len, const QByteArray& val)
 {
     Token t( tt, start, len, val );
@@ -410,7 +438,7 @@ Token Lexer::atom()
     while( true )
     {
         char c = readc();
-        if( c == '%' )
+        if( !inQuote && c == '%' )
         {
             extra++;
             c = readc(); // escape

LICENSE.GPL3

@@ -69,6 +69,7 @@ struct Token
     const char* getString() const;
 
     static QByteArray getSymbol( const QByteArray& );
+    static QStringList getAllSymbols();
 };
 
 class Lexer : public QObject
@@ -87,6 +88,8 @@ class Lexer : public QObject
     void setEmitComments(bool on) { emitComments = on; }
     void setPacked(bool on) { packed = on; }
     RowCol getPos() const { return pos; }
+    void startQuote();
+    void endQuote();
 
     static bool atom_delimiter(char);
 
@@ -109,6 +112,7 @@ class Lexer : public QObject
     QList<Token> buffer;
     bool emitComments;
     bool packed;
+    bool inQuote;
 };
 
 }

LispLexer.cpp

@@ -40,6 +40,9 @@
 #include <QtDebug>
 #include <QSettings>
 #include <QDesktopWidget>
+#include <QShortcut>
+#include <QInputDialog>
+#include <QListWidget>
 
 static Navigator* s_this = 0;
 static void report(QtMsgType type, const QString& message )
@@ -311,6 +314,7 @@ Navigator::Navigator(QWidget *parent)
     createSourceTree();
     createXref();
     createLog();
+    createAtomList();
 
     s_this = this;
     s_oldHandler = qInstallMessageHandler(messageHander);
@@ -330,6 +334,8 @@ Navigator::Navigator(QWidget *parent)
 
     new Gui::AutoShortcut( tr("ALT+Left"), this, this, SLOT(handleGoBack()) );
     new Gui::AutoShortcut( tr("ALT+Right"), this, this, SLOT(handleGoForward()) );
+    new QShortcut(tr("CTRL+SHIFT+F"),this,SLOT(onSearchAtom()));
+    new QShortcut(tr("CTRL+SHIFT+A"),this,SLOT(onSelectAtom()));
 
 }
 
@@ -361,6 +367,8 @@ static QByteArray decode(const QByteArray& source)
             bytes += "↑";
         else if( isprint(ch) || isspace(ch) )
             bytes += ch;
+        else if( !bytes.isEmpty() && bytes[bytes.size()-1] == '%' )
+            bytes += ' ';
     }
     return bytes;
 }
@@ -426,6 +434,7 @@ void Navigator::load(const QString& path)
     viewer->clear();
     asts.clear();
     xref.clear();
+    atomList->clear();
     root = path;
     QStringList files = collectFiles(path);
     QMap<QString,QTreeWidgetItem*> dirs;
@@ -454,6 +463,7 @@ void Navigator::load(const QString& path)
         item->setText(0, debang(info.baseName()) );
         item->setIcon(0, fip.icon(QFileIconProvider::File));
         item->setData(0,Qt::UserRole, f);
+        item->setToolTip(0,f);
 
         QFile in(f);
         if( !in.open(QFile::ReadOnly) )
@@ -466,7 +476,8 @@ void Navigator::load(const QString& path)
         if( !r.read(&in, f) )
         {
             qCritical() << "ERROR " << info.baseName() << r.getPos().row << r.getError();
-        }else
+        }
+        // else
         {
             Lisp::Reader::Object ast = r.getAst();
             asts.insert(f, ast);
@@ -482,9 +493,17 @@ void Navigator::load(const QString& path)
                 out.setDevice(&file);
                 ast.print(out);
             }
+#endif
+#if 0
+            QFile file(f + ".lisp");
+            if( file.open(QFile::WriteOnly) )
+            {
+                in.reset();
+                QByteArray code = decode(in.readAll());
+                file.write( code );
+            }
 #endif
         }
-        //return; // TEST
 
 #if 0
         Lisp::Lexer lex;
@@ -499,6 +518,8 @@ void Navigator::load(const QString& path)
             qCritical() << t.getName() << t.pos.row << t.pos.col << t.val;
 #endif
     }
+
+    atomList->addItems(Lisp::Token::getAllSymbols());
 }
 
 void Navigator::logMessage(const QString& str)
@@ -560,6 +581,31 @@ void Navigator::onUpdateLocation(int line, int col)
     pushLocation(Location(viewer->getPath(), line,col,viewer->verticalScrollBar()->value()));
 }
 
+void Navigator::onSearchAtom()
+{
+    const QString pname = QInputDialog::getText(this, "Search Atom", "Enter an atom pname (case sensitive)");
+    if( pname.isEmpty() )
+        return;
+    const char* atom = Lisp::Token::getSymbol(pname.toUtf8());
+    fillXrefForAtom(atom, Lisp::RowCol());
+}
+
+void Navigator::onSelectAtom()
+{
+    const QString pname = QInputDialog::getItem(this, "Select Atom", "Select an atom from the list:",
+                                                Lisp::Token::getAllSymbols() );
+    if( pname.isEmpty() )
+        return;
+    const char* atom = Lisp::Token::getSymbol(pname.toUtf8());
+    fillXrefForAtom(atom, Lisp::RowCol());
+}
+
+void Navigator::onAtomDblClicked(QListWidgetItem* item)
+{
+    const char* atom = Lisp::Token::getSymbol(item->text().toUtf8());
+    fillXrefForAtom(atom, Lisp::RowCol());
+}
+
 void Navigator::pushLocation(const Navigator::Location& loc)
 {
     if( d_pushBackLock )
@@ -643,7 +689,7 @@ void Navigator::createXref()
     d_xref->setRootIsDecorated(false);
     vbox->addWidget(d_xref);
     dock->setWidget(pane);
-    addDockWidget( Qt::LeftDockWidgetArea, dock );
+    addDockWidget( Qt::RightDockWidgetArea, dock );
     connect(d_xref, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(onXrefDblClicked()) );
 }
 
@@ -661,6 +707,20 @@ void Navigator::createLog()
     new QShortcut(tr("ESC"), dock, SLOT(close()) );
 }
 
+void Navigator::createAtomList()
+{
+    QDockWidget* dock = new QDockWidget( tr("Atoms"), this );
+    dock->setObjectName("AtomList");
+    dock->setAllowedAreas( Qt::AllDockWidgetAreas );
+    dock->setFeatures( QDockWidget::DockWidgetMovable );
+    atomList = new QListWidget(dock);
+    atomList->setAlternatingRowColors(true);
+    atomList->setSortingEnabled(false);
+    dock->setWidget(atomList);
+    addDockWidget( Qt::LeftDockWidgetArea, dock );
+    connect( atomList,SIGNAL(itemDoubleClicked(QListWidgetItem*)),this,SLOT(onAtomDblClicked(QListWidgetItem*)));
+}
+
 void Navigator::closeEvent(QCloseEvent* event)
 {
     QSettings s;
@@ -730,7 +790,7 @@ void Navigator::fillXrefForAtom(const char* atom, const Lisp::RowCol& rc)
     QFont f = d_xref->font();
     f.setBold(true);
 
-    d_xrefTitle->setText(atom);
+    d_xrefTitle->setText(tr("Atom: %1").arg(atom));
     const QString curMod = viewer->getPath();
 
     QTreeWidgetItem* black = 0;
@@ -821,7 +881,7 @@ int main(int argc, char *argv[])
     a.setOrganizationName("[email protected]");
     a.setOrganizationDomain("github.com/rochus-keller/Interlisp");
     a.setApplicationName("InterlispNavigator");
-    a.setApplicationVersion("0.2.0");
+    a.setApplicationVersion("0.2.1");
     a.setStyle("Fusion");
     Navigator w;
     if( a.arguments().size() > 1 )

LispLexer.h

@@ -29,6 +29,8 @@ class QLabel;
 class QTreeWidgetItem;
 class CodeEditor;
 class QPlainTextEdit;
+class QListWidget;
+class QListWidgetItem;
 
 class Navigator : public QMainWindow
 {
@@ -48,6 +50,9 @@ protected slots:
     void onXrefDblClicked();
     void onCursor();
     void onUpdateLocation(int line, int col);
+    void onSearchAtom();
+    void onSelectAtom();
+    void onAtomDblClicked(QListWidgetItem*);
 
 protected:
     struct Location
@@ -69,6 +74,7 @@ protected slots:
     void createSourceTree();
     void createXref();
     void createLog();
+    void createAtomList();
     void closeEvent(QCloseEvent* event);
     void fillXref();
     void fillXrefForAtom(const char* atom, const Lisp::RowCol& rc);
@@ -81,6 +87,7 @@ protected slots:
     QLabel* d_xrefTitle;
     QTreeWidget* d_xref;
     QPlainTextEdit* d_msgLog;
+    QListWidget* atomList;
     class Viewer;
     Viewer* viewer;
     QString root;