Changeset 174

Timestamp:

10/24/02 17:32:59 (21 years ago)

Author:

piso

Message:

Get prompt from buffer.

File:

• trunk/j/src/org/armedbear/j/LispShellFormatter.java (modified) (4 diffs)

trunk/j/src/org/armedbear/j/LispShellFormatter.java

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: LispShellFormatter.java,v 1.1 2002-10-19 14:06:57 piso Exp $
+ * $Id: LispShellFormatter.java,v 1.2 2002-10-24 17:32:59 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -32 +32 @@
     private static final byte FORMAT_PROMPT = 1;
     private static final byte FORMAT_INPUT  = 2;
+
+    private final RE defaultPromptRE =
+        new UncheckedRE("^[^>\\*\\]]*[>\\*\\]] *");
 
     public LispShellFormatter(Buffer buffer)
@@ -76 +79 @@
     }
 
-    private final RE promptRE = new UncheckedRE("^[^>\\*\\]]*[>\\*\\]] *");
-
     private int getPromptEndIndex(String text)
     {
@@ -91 +92 @@
         if (text.startsWith("* "))
             return 2;
+        final RE promptRE;
+        if (buffer instanceof CommandInterpreter)
+            promptRE = ((CommandInterpreter)buffer).getPromptRE();
+        else
+            promptRE = defaultPromptRE;
         REMatch match = promptRE.getMatch(text);
         if (match != null)