more mass renaming

src/gsc.erl

@@ -4,15 +4,14 @@
 % based on original sophia compiler
 %
 % parse layers:
-% 1. gsc_tokenizer: SrcStr -> (Tokens | SigTokens)
+% 1. gs_tokens: SrcStr -> (Tokens | SigTokens)
 %
 %    SigTokens = not comment/whitespace
 %
 %    layers:
-%    a. gsc_strmatch : matches string shapes
-%    b. gsc_so_scan  : converts to so_scan shapes
+%    a. gs_strmatch : matches string shapes
+%    b. gso_scan  : converts to so_scan shapes
 %
-% 2. gsc_ast: SigTokens -> AST
 %
 % terminology:
 %
@@ -30,16 +29,8 @@
 %
 % @end
 
-% TODO:
-%   - barf for outputs, slurp for inputs
-%   - architecture needs more careful thought but only after something works
-%   - too fuzzy right now
-%   - possibly:
-%       - rename parser layers sequentially:
-%       - gsc_
 -module(gsc).
 
-
 -export_type([
     token/0
 ]).
@@ -48,10 +39,7 @@
     sigtokens_from_file/1,
     sigtokens_from_string/1,
     tokens_from_file/1,
-    tokens_from_string/1,
-    ast_from_file/1,
-    ast_from_string/1,
-    ast_from_tokens/1
+    tokens_from_string/1
 ]).
 
 -include("$gsc_include/gsc.hrl").
@@ -68,13 +56,13 @@
 
 sigtokens_from_file(X) ->
     case tokens_from_file(X) of
-        {ok, Y} -> {ok, gsc_tokens:filter_significant(Y)};
+        {ok, Y} -> {ok, gs_tokens:filter_significant(Y)};
         Err     -> Err
     end.
 
 sigtokens_from_string(X) ->
     case tokens_from_string(X) of
-        {ok, Y} -> {ok, gsc_tokens:filter_significant(Y)};
+        {ok, Y} -> {ok, gs_tokens:filter_significant(Y)};
         Err     -> Err
     end.
 
@@ -101,44 +89,4 @@ tokens_from_file(FilePath) ->
          Tokens   :: [tk()].
 
 tokens_from_string(SrcStr) ->
-    gsc_tokens:tokens(SrcStr).
-
-
-
--spec ast_from_file(FilePath) -> Perhaps
-    when FilePath :: string(),
-         Perhaps  :: {ok, AST} | {error, gsc_err()},
-         AST      :: gsc_ast().
-
-ast_from_file(FilePath) ->
-    case file:read_file(FilePath) of
-        {ok, FileBytes} -> ast_from_string(FileBytes);
-        Error           -> Error
-    end.
-
-
-
--spec ast_from_string(SrcStr) -> Perhaps
-    when SrcStr   :: string(),
-         Perhaps  :: {ok, AST} | {error, gsc_err()},
-         AST      :: gsc_ast().
-
-ast_from_string(SrcStr) ->
-    case gsc_tokens:significant_tokens(SrcStr) of
-        {ok, SigTks} -> ast_from_tokens(SigTks); 
-        Error        -> Error
-    end.
-
-
-
--spec ast_from_tokens(SrcTokens) -> Perhaps
-    when SrcTokens :: [tk()],
-         Perhaps   :: {ok, AST} | {error, gsc_err()},
-         AST       :: gsc_ast().
-
-ast_from_tokens(Tks) ->
-    SigTks = gsc_tokens:filter_significant(Tks),
-    case gsc_ast:gulp_file(SigTks) of
-        {gulp, AST} -> {ok, AST};
-        Error       -> Error
-    end.
+    gs_tokens:tokens(SrcStr).