Add support for multi-line ( comments

[pforth] / fth / file.fth

diff --git a/fth/file.fth b/fth/file.fth
index c55de78..6b0db20 100644 (file)
--- a/fth/file.fth
+++ b/fth/file.fth
@@ -1,29 +1,35 @@
 \ READ-LINE and WRITE-LINE
 \
 \ READ-LINE and WRITE-LINE
 \

-\ This file is in the public domain.
+\ This code is part of pForth.

 \
 \

+\ The pForth software code is dedicated to the public domain,
+\ and any third party may reproduce, distribute and modify
+\ the pForth software code or any derivative works thereof
+\ without any compensation or license.  The pForth software
+\ code is provided on an "as is" basis without any warranty
+\ of any kind, including, without limitation, the implied
+\ warranties of merchantability and fitness for a particular
+\ purpose and their equivalents under the laws of any jurisdiction.

 
 private{
 
 
 private{
 

-10 constant \n
-13 constant \r
+10 constant \N
+13 constant \R

 
 \ Unread one char from file FILEID.
 
 \ Unread one char from file FILEID.

-: UNREAD ( fileid -- ior )
-    { f }
-    f file-position          ( ud ior )
+: UNREAD { fileid -- ior }
+    fileid file-position          ( ud ior )

     ?dup
     IF   nip nip \ IO error
     ?dup
     IF   nip nip \ IO error

-    ELSE 1 s>d d- f reposition-file
+    ELSE 1 s>d d- fileid reposition-file

     THEN
 ;
 
 \ Read the next available char from file FILEID and if it is a \n then
 \ skip it; otherwise unread it.  IOR is non-zero if an error occured.
     THEN
 ;
 
 \ Read the next available char from file FILEID and if it is a \n then
 \ skip it; otherwise unread it.  IOR is non-zero if an error occured.

-\ C-ADDR is a buffer that can hold at least on char.
-: SKIP-\n ( c-addr fileid -- ior )
-    { a f }
-    a 1 f read-file               ( u ior )
+\ C-ADDR is a buffer that can hold at least one char.
+: SKIP-\N { c-addr fileid -- ior }
+    c-addr 1 fileid read-file     ( u ior )

     ?dup
     IF \ Read error?
         nip
     ?dup
     IF \ Read error?
         nip


@@ -32,9 +38,9 @@ private{
         IF \ End of file?
             0
         ELSE
         IF \ End of file?
             0
         ELSE

-            a c@ \n =             ( is-it-a-\n? )
+            c-addr c@ \n =        ( is-it-a-\n? )

             IF   0
             IF   0

-            ELSE f unread
+            ELSE fileid unread

             THEN
         THEN
     THEN
             THEN
         THEN
     THEN


@@ -44,8 +50,28 @@ private{
 create (LINE-TERMINATOR) \n c,
 : LINE-TERMINATOR ( -- c-addr u ) (line-terminator) 1 ;
 
 create (LINE-TERMINATOR) \n c,
 : LINE-TERMINATOR ( -- c-addr u ) (line-terminator) 1 ;
 

-}private
+\ Standard throw code
+\ See: http://lars.nocrew.org/forth2012/exception.html#table:throw
+-72 constant THROW_RENAME_FILE
+
+\ Copy the string C-ADDR/U1 to C-ADDR2 and append a NUL.
+: PLACE-CSTR  ( c-addr1 u1 c-addr2 -- )
+    2dup 2>r          ( c-addr1 u1 c-addr2 )  ( r: u1 c-addr2 )
+    swap cmove        ( ) ( r: u1 c-addr2 )
+    0 2r> + c!        ( )
+;
+
+: MULTI-LINE-COMMENT ( "comment<rparen>" -- )
+    BEGIN
+        >in @ ')' parse         ( >in c-addr len )
+        nip + >in @ =           ( delimiter-not-found? )
+    WHILE                       ( )
+        refill 0= IF EXIT THEN  ( )
+    REPEAT
+
+;

 
 

+}private

 
 \ This treats \n, \r\n, and \r as line terminator.  Reading is done
 \ one char at a time with READ-FILE hence READ-FILE should probably do
 
 \ This treats \n, \r\n, and \r as line terminator.  Reading is done
 \ one char at a time with READ-FILE hence READ-FILE should probably do


@@ -55,13 +81,13 @@ create (LINE-TERMINATOR) \n c,
     u 0 ?DO
         a i chars + 1 f read-file                                  ( u ior' )
         ?dup IF nip i false rot UNLOOP EXIT THEN \ Read error?     ( u )
     u 0 ?DO
         a i chars + 1 f read-file                                  ( u ior' )
         ?dup IF nip i false rot UNLOOP EXIT THEN \ Read error?     ( u )

-        0= IF i i 0> 0 UNLOOP EXIT THEN          \ End of file?    ( )
+        0= IF i i 0<> 0 UNLOOP EXIT THEN         \ End of file?    ( )

         a i chars + c@
         CASE
             \n OF i true 0 UNLOOP EXIT ENDOF
             \r OF
                 \ Detect \r\n
         a i chars + c@
         CASE
             \n OF i true 0 UNLOOP EXIT ENDOF
             \r OF
                 \ Detect \r\n

-                a i 1+ chars + f skip-\n                           ( ior )
+                a i chars + f skip-\n                              ( ior )

                 ?dup IF i false rot UNLOOP EXIT THEN \ IO Error?   ( )
                 i true 0 UNLOOP EXIT
            ENDOF
                 ?dup IF i false rot UNLOOP EXIT THEN \ IO Error?   ( )
                 i true 0 UNLOOP EXIT
            ENDOF


@@ -80,4 +106,25 @@ create (LINE-TERMINATOR) \n c,
     THEN
 ;
 
     THEN
 ;
 

+: RENAME-FILE ( c-addr1 u1 c-addr2 u2 -- ior )
+    { a1 u1 a2 u2 | new }
+    \ Convert the file-names to C-strings by copying them after HERE.
+    a1 u1 here place-cstr
+    here u1 1+ chars + to new
+    a2 u2 new place-cstr
+    here new (rename-file) 0=
+    IF 0
+    ELSE throw_rename_file
+    THEN
+;
+
+: (  ( "comment<rparen>"  -- )
+    source-id
+    CASE
+        -1 OF postpone ( ENDOF
+        0  OF postpone ( ENDOF
+        multi-line-comment
+    ENDCASE
+; immediate
+

 privatize
 privatize