From: Mark Wooding Date: Fri, 12 Jul 2013 00:37:09 +0000 (+0100) Subject: Change naming convention around. X-Git-Tag: 0.1.0~9 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/commitdiff_plain/aa14a4cddcb96b681d5c19a2ec8bad382f43b264 Change naming convention around. Put `test', `proto', `impl', `parse', `output' on the end, not the start. This keeps pieces of the same chunk of functionality together in listings. --- diff --git a/src/test-base.lisp b/src/base-test.lisp similarity index 100% rename from src/test-base.lisp rename to src/base-test.lisp diff --git a/src/impl-c-types-class.lisp b/src/c-types-class-impl.lisp similarity index 100% rename from src/impl-c-types-class.lisp rename to src/c-types-class-impl.lisp diff --git a/src/impl-c-types.lisp b/src/c-types-impl.lisp similarity index 100% rename from src/impl-c-types.lisp rename to src/c-types-impl.lisp diff --git a/src/parse-c-types.lisp b/src/c-types-parse.lisp similarity index 100% rename from src/parse-c-types.lisp rename to src/c-types-parse.lisp diff --git a/src/proto-c-types.lisp b/src/c-types-proto.lisp similarity index 100% rename from src/proto-c-types.lisp rename to src/c-types-proto.lisp diff --git a/src/test-c-types.lisp b/src/c-types-test.lisp similarity index 100% rename from src/test-c-types.lisp rename to src/c-types-test.lisp diff --git a/src/impl-class-finalize.lisp b/src/class-finalize-impl.lisp similarity index 100% rename from src/impl-class-finalize.lisp rename to src/class-finalize-impl.lisp diff --git a/src/proto-class-finalize.lisp b/src/class-finalize-proto.lisp similarity index 100% rename from src/proto-class-finalize.lisp rename to src/class-finalize-proto.lisp diff --git a/src/impl-class-layout.lisp b/src/class-layout-impl.lisp similarity index 100% rename from src/impl-class-layout.lisp rename to src/class-layout-impl.lisp diff --git a/src/proto-class-layout.lisp b/src/class-layout-proto.lisp similarity index 100% rename from src/proto-class-layout.lisp rename to src/class-layout-proto.lisp diff --git a/src/impl-class-make.lisp b/src/class-make-impl.lisp similarity index 100% rename from src/impl-class-make.lisp rename to src/class-make-impl.lisp diff --git a/src/proto-class-make.lisp b/src/class-make-proto.lisp similarity index 100% rename from src/proto-class-make.lisp rename to src/class-make-proto.lisp diff --git a/src/output-class.lisp b/src/class-output.lisp similarity index 100% rename from src/output-class.lisp rename to src/class-output.lisp diff --git a/src/impl-codegen.lisp b/src/codegen-impl.lisp similarity index 100% rename from src/impl-codegen.lisp rename to src/codegen-impl.lisp diff --git a/src/proto-codegen.lisp b/src/codegen-proto.lisp similarity index 100% rename from src/proto-codegen.lisp rename to src/codegen-proto.lisp diff --git a/src/test-codegen.lisp b/src/codegen-test.lisp similarity index 100% rename from src/test-codegen.lisp rename to src/codegen-test.lisp diff --git a/src/parse-fragment.lisp b/src/fragment-parse.lisp similarity index 100% rename from src/parse-fragment.lisp rename to src/fragment-parse.lisp diff --git a/src/impl-lexer.lisp b/src/lexer-impl.lisp similarity index 100% rename from src/impl-lexer.lisp rename to src/lexer-impl.lisp diff --git a/src/proto-lexer.lisp b/src/lexer-proto.lisp similarity index 100% rename from src/proto-lexer.lisp rename to src/lexer-proto.lisp diff --git a/src/test-lexer.lisp b/src/lexer-test.lisp similarity index 100% rename from src/test-lexer.lisp rename to src/lexer-test.lisp diff --git a/src/parse-lexical.lisp b/src/lexical-parse.lisp similarity index 100% rename from src/parse-lexical.lisp rename to src/lexical-parse.lisp diff --git a/src/impl-method.lisp b/src/method-impl.lisp similarity index 100% rename from src/impl-method.lisp rename to src/method-impl.lisp diff --git a/src/proto-method.lisp b/src/method-proto.lisp similarity index 100% rename from src/proto-method.lisp rename to src/method-proto.lisp diff --git a/src/impl-module.lisp b/src/module-impl.lisp similarity index 100% rename from src/impl-module.lisp rename to src/module-impl.lisp diff --git a/src/parse-module.lisp b/src/module-parse.lisp similarity index 100% rename from src/parse-module.lisp rename to src/module-parse.lisp diff --git a/src/proto-module.lisp b/src/module-proto.lisp similarity index 100% rename from src/proto-module.lisp rename to src/module-proto.lisp diff --git a/src/impl-output.lisp b/src/output-impl.lisp similarity index 100% rename from src/impl-output.lisp rename to src/output-impl.lisp diff --git a/src/proto-output.lisp b/src/output-proto.lisp similarity index 100% rename from src/proto-output.lisp rename to src/output-proto.lisp diff --git a/src/parser/impl-floc.lisp b/src/parser/floc-impl.lisp similarity index 100% rename from src/parser/impl-floc.lisp rename to src/parser/floc-impl.lisp diff --git a/src/parser/proto-floc.lisp b/src/parser/floc-proto.lisp similarity index 100% rename from src/parser/proto-floc.lisp rename to src/parser/floc-proto.lisp diff --git a/src/parser/impl-parser-expr.lisp b/src/parser/parser-expr-impl.lisp similarity index 100% rename from src/parser/impl-parser-expr.lisp rename to src/parser/parser-expr-impl.lisp diff --git a/src/parser/proto-parser-expr.lisp b/src/parser/parser-expr-proto.lisp similarity index 100% rename from src/parser/proto-parser-expr.lisp rename to src/parser/parser-expr-proto.lisp diff --git a/src/parser/impl-parser.lisp b/src/parser/parser-impl.lisp similarity index 100% rename from src/parser/impl-parser.lisp rename to src/parser/parser-impl.lisp diff --git a/src/parser/impl-parser-plug.lisp b/src/parser/parser-plug-impl.lisp similarity index 100% rename from src/parser/impl-parser-plug.lisp rename to src/parser/parser-plug-impl.lisp diff --git a/src/parser/proto-parser.lisp b/src/parser/parser-proto.lisp similarity index 100% rename from src/parser/proto-parser.lisp rename to src/parser/parser-proto.lisp diff --git a/src/parser/test-parser.lisp b/src/parser/parser-test.lisp similarity index 100% rename from src/parser/test-parser.lisp rename to src/parser/parser-test.lisp diff --git a/src/parser/impl-scanner-charbuf.lisp b/src/parser/scanner-charbuf-impl.lisp similarity index 100% rename from src/parser/impl-scanner-charbuf.lisp rename to src/parser/scanner-charbuf-impl.lisp diff --git a/src/parser/test-scanner-charbuf.lisp b/src/parser/scanner-charbuf-test.lisp similarity index 100% rename from src/parser/test-scanner-charbuf.lisp rename to src/parser/scanner-charbuf-test.lisp diff --git a/src/parser/impl-scanner-context.lisp b/src/parser/scanner-context-impl.lisp similarity index 100% rename from src/parser/impl-scanner-context.lisp rename to src/parser/scanner-context-impl.lisp diff --git a/src/parser/impl-scanner.lisp b/src/parser/scanner-impl.lisp similarity index 100% rename from src/parser/impl-scanner.lisp rename to src/parser/scanner-impl.lisp diff --git a/src/parser/proto-scanner.lisp b/src/parser/scanner-proto.lisp similarity index 100% rename from src/parser/proto-scanner.lisp rename to src/parser/scanner-proto.lisp diff --git a/src/parser/impl-scanner-token.lisp b/src/parser/scanner-token-impl.lisp similarity index 100% rename from src/parser/impl-scanner-token.lisp rename to src/parser/scanner-token-impl.lisp diff --git a/src/parser/impl-streams.lisp b/src/parser/streams-impl.lisp similarity index 100% rename from src/parser/impl-streams.lisp rename to src/parser/streams-impl.lisp diff --git a/src/parser/proto-streams.lisp b/src/parser/streams-proto.lisp similarity index 100% rename from src/parser/proto-streams.lisp rename to src/parser/streams-proto.lisp diff --git a/src/impl-pset.lisp b/src/pset-impl.lisp similarity index 100% rename from src/impl-pset.lisp rename to src/pset-impl.lisp diff --git a/src/parse-pset.lisp b/src/pset-parse.lisp similarity index 100% rename from src/parse-pset.lisp rename to src/pset-parse.lisp diff --git a/src/proto-pset.lisp b/src/pset-proto.lisp similarity index 100% rename from src/proto-pset.lisp rename to src/pset-proto.lisp diff --git a/src/sod-test.asd b/src/sod-test.asd index b8646a3..38b5095 100644 --- a/src/sod-test.asd +++ b/src/sod-test.asd @@ -51,13 +51,13 @@ ;; Test the parser edifice. (:module "parser" :depends-on ("test-base") :components - ((:file "test-parser") - (:file "test-scanner-charbuf"))) + ((:file "parser-test") + (:file "scanner-charbuf-test"))) ;; The actual tests. - (:file "test-c-types" :depends-on ("test-base")) - (:file "test-codegen" :depends-on ("test-base")) - (:file "test-lexer" :depends-on ("test-base")))) + (:file "c-types-test" :depends-on ("test-base")) + (:file "codegen-test" :depends-on ("test-base")) + (:file "lexer-test" :depends-on ("test-base")))) ;;;-------------------------------------------------------------------------- ;;; Testing. diff --git a/src/sod.asd b/src/sod.asd index 822afae..6c6d4fe 100644 --- a/src/sod.asd +++ b/src/sod.asd @@ -71,90 +71,90 @@ ((:file "package") ;; File location protocol (including error reporting). - (:file "proto-floc" :depends-on ("package")) - (:file "impl-floc" :depends-on ("proto-floc")) + (:file "floc-proto" :depends-on ("package")) + (:file "floc-impl" :depends-on ("floc-proto")) ;; Position-aware streams. - (:file "proto-streams" :depends-on ("package")) - (:file "impl-streams" :depends-on ("proto-streams" "proto-floc")) + (:file "streams-proto" :depends-on ("package")) + (:file "streams-impl" :depends-on ("streams-proto" "floc-proto")) ;; Scanner protocol, and various scanner implementations. - (:file "proto-scanner" :depends-on ("package")) - (:file "impl-scanner" :depends-on ("proto-scanner")) - (:file "impl-scanner-charbuf" :depends-on - ("proto-scanner" "proto-floc" "proto-streams")) - (:file "impl-scanner-token" :depends-on ("proto-scanner")) + (:file "scanner-proto" :depends-on ("package")) + (:file "scanner-impl" :depends-on ("scanner-proto")) + (:file "scanner-charbuf-impl" :depends-on + ("scanner-proto" "floc-proto" "streams-proto")) + (:file "scanner-token-impl" :depends-on ("scanner-proto")) ;; Parser notation macro support. - (:file "proto-parser" :depends-on ("package")) - (:file "impl-parser" :depends-on ("proto-parser")) + (:file "parser-proto" :depends-on ("package")) + (:file "parser-impl" :depends-on ("parser-proto")) ;; Expression parser support. - (:file "proto-parser-expr" :depends-on ("proto-parser")) - (:file "impl-parser-expr" :depends-on ("proto-parser-expr")) + (:file "parser-expr-proto" :depends-on ("parser-proto")) + (:file "parser-expr-impl" :depends-on ("parser-expr-proto")) ;; Stitching parsers to scanners. - (:file "impl-scanner-context" :depends-on - ("proto-parser" "proto-scanner")))) + (:file "scanner-context-impl" :depends-on + ("parser-proto" "scanner-proto")))) (:file "package" :depends-on ("parser")) ;; C type representation protocol. - (:file "proto-c-types" :depends-on ("package")) - (:file "impl-c-types" :depends-on ("proto-c-types")) + (:file "c-types-proto" :depends-on ("package")) + (:file "c-types-impl" :depends-on ("c-types-proto")) ;; Property set protocol. - (:file "proto-pset" :depends-on ("package")) - (:file "impl-pset" :depends-on ("proto-pset")) - (:file "parse-pset" :depends-on ("proto-pset" "parse-lexical")) + (:file "pset-proto" :depends-on ("package")) + (:file "pset-impl" :depends-on ("pset-proto")) + (:file "pset-parse" :depends-on ("pset-proto" "lexical-parse")) ;; Lexical analysis. - (:file "parse-lexical" :depends-on ("parser")) - (:file "parse-fragment" :depends-on ("parse-lexical")) + (:file "lexical-parse" :depends-on ("parser")) + (:file "fragment-parse" :depends-on ("lexical-parse")) ;; Code generation protocol. - (:file "proto-codegen" :depends-on ("package")) - (:file "impl-codegen" :depends-on ("proto-codegen")) + (:file "codegen-proto" :depends-on ("package")) + (:file "codegen-impl" :depends-on ("codegen-proto")) ;; Modules. - (:file "proto-module" :depends-on ("package")) - (:file "impl-module" :depends-on - ("proto-module" "proto-pset" "impl-c-types-class" "builtin")) - (:file "builtin" :depends-on ("proto-module" "proto-pset" "classes" - "impl-c-types" "impl-c-types-class")) - (:file "parse-module" :depends-on ("impl-module" - "parse-lexical" "parse-fragment")) + (:file "module-proto" :depends-on ("package")) + (:file "module-impl" :depends-on + ("module-proto" "pset-proto" "c-types-class-impl" "builtin")) + (:file "builtin" :depends-on ("module-proto" "pset-proto" "classes" + "c-types-impl" "c-types-class-impl")) + (:file "module-parse" :depends-on ("module-impl" + "lexical-parse" "fragment-parse")) ;; Output. - (:file "proto-output" :depends-on ("package")) - (:file "impl-output" :depends-on ("proto-output")) + (:file "output-proto" :depends-on ("package")) + (:file "output-impl" :depends-on ("output-proto")) ;; Class representation. - (:file "classes" :depends-on ("package" "proto-c-types")) - (:file "impl-c-types-class" :depends-on ("classes" "proto-module")) + (:file "classes" :depends-on ("package" "c-types-proto")) + (:file "c-types-class-impl" :depends-on ("classes" "module-proto")) (:file "class-utilities" :depends-on - ("classes" "impl-codegen" "impl-pset" - "impl-c-types" "impl-c-types-class")) + ("classes" "codegen-impl" "pset-impl" + "c-types-impl" "c-types-class-impl")) ;; Class construction. - (:file "proto-class-make" :depends-on ("class-utilities")) - (:file "impl-class-make" :depends-on ("proto-class-make")) + (:file "class-make-proto" :depends-on ("class-utilities")) + (:file "class-make-impl" :depends-on ("class-make-proto")) ;; Class layout. - (:file "proto-class-layout" :depends-on ("class-utilities")) - (:file "impl-class-layout" :depends-on - ("proto-class-layout" "proto-method")) + (:file "class-layout-proto" :depends-on ("class-utilities")) + (:file "class-layout-impl" :depends-on + ("class-layout-proto" "method-proto")) ;; Class finalization. - (:file "proto-class-finalize" :depends-on ("class-utilities")) - (:file "impl-class-finalize" :depends-on ("proto-class-finalize")) + (:file "class-finalize-proto" :depends-on ("class-utilities")) + (:file "class-finalize-impl" :depends-on ("class-finalize-proto")) ;; Method generation. - (:file "proto-method" :depends-on ("class-utilities")) - (:file "impl-method" :depends-on ("proto-method")) + (:file "method-proto" :depends-on ("class-utilities")) + (:file "method-impl" :depends-on ("method-proto")) ;; Class output. - (:file "output-class" :depends-on ("proto-output" "classes")))) + (:file "class-output" :depends-on ("output-proto" "classes")))) ;;;-------------------------------------------------------------------------- ;;; Testing.