first-char and rest-char to first and rest

1 files changed, 17 insertions, 17 deletions

diff --git a/libs/fstring.neb b/libs/fstring.neb
index ce971e4..0147965 100644
--- a/libs/fstring.neb
+++ b/libs/fstring.neb
@@ -27,47 +27,47 @@
         out)
 
     (func special-parse (str cur val)
-        (if (eq? "}" (first-char str))
+        (if (eq? "}" (first str))
             (block
                 ; [align][width] (to start)
                 (def align-width
-                    (if (in? (first-char cur) aligns)
-                        (list (first-char cur) (string->int (rest-char cur)))
+                    (if (in? (first cur) aligns)
+                        (list (first cur) (string->int (rest cur)))
                         (list "<" (string->int cur))))
                 (branch
                     ((>= (length val) (last align-width))
-                        (list (rest-char str) val))
+                        (list (rest str) val))
                     ((eq? "<" (first align-width))  ; align left
-                        (list (rest-char str) (concat val (repeat (- (last align-width) (length val))))))
+                        (list (rest str) (concat val (repeat (- (last align-width) (length val))))))
                     ((eq? ">" (first align-width))  ; align right
-                        (list (rest-char str) (concat (repeat (- (last align-width) (length val))) val)))
+                        (list (rest str) (concat (repeat (- (last align-width) (length val))) val)))
                     (#true  ; align center
                         (block
                             (def half (/ (- (last align-width) (length val)) 2))
                             (if (int? half)
-                                (list (rest-char str) (concat (repeat half) val (repeat half)))
-                                (list (rest-char str) (concat (repeat (floor half)) val (repeat (+ 1 (floor half))))))))))
+                                (list (rest str) (concat (repeat half) val (repeat half)))
+                                (list (rest str) (concat (repeat (floor half)) val (repeat (+ 1 (floor half))))))))))
 
-            (special-parse (rest-char str) (concat cur (first-char str)) val)))
+            (special-parse (rest str) (concat cur (first str)) val)))
 
 
     (func brace-parse :[:string] (str :string cur :string)
         ; returns (remaining value)
         (branch
-            ((eq? "}" (first-char str))
-                (list (rest-char str) (->string (eval (first (parse-neb cur))))))
-            ((eq? "," (first-char str))
-                (special-parse (rest-char str) "" (->string (eval (parse-neb cur)))))
+            ((eq? "}" (first str))
+                (list (rest str) (->string (eval (first (parse-neb cur))))))
+            ((eq? "," (first str))
+                (special-parse (rest str) "" (->string (eval (first (parse-neb cur))))))
             (#true
-                (brace-parse (rest-char str) (concat cur (first-char str))))))
+                (brace-parse (rest str) (concat cur (first str))))))
 
     (func inner-parse (str cur)
         (branch
             ((eq? 0 (length str)) cur)
-            ((eq? "{" (first-char str))
+            ((eq? "{" (first str))
                 (block
-                    (def tmp (brace-parse (rest-char str) ""))
+                    (def tmp (brace-parse (rest str) ""))
                     (inner-parse (first tmp) (concat cur (first (rest tmp))))))
-            (#true (inner-parse (rest-char str) (concat cur (first-char str))))))
+            (#true (inner-parse (rest str) (concat cur (first str))))))
 
     (inner-parse inp ""))