From e382be89db63da33ee309ea02b4e618a87096cf9 Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Sat, 15 Sep 2018 16:35:15 +0200 Subject: [PATCH] changed source file suffix to .p8 --- .gitignore | 4 +++- compiler/examples/{imported.ill => imported.p8} | 0 compiler/examples/{imported2.ill => imported2.p8} | 0 compiler/examples/{numbergame.ill => numbergame.p8} | 0 compiler/examples/{test.ill => test.p8} | 0 compiler/src/prog8/parser/ModuleParsing.kt | 2 +- docs/source/building.rst | 2 +- docs/source/programming.rst | 4 ++-- docs/source/syntaxreference.rst | 2 +- prog8lib/{c64lib.ill => c64lib.p8} | 0 prog8lib/{mathlib.ill => mathlib.p8} | 0 prog8lib/{prog8lib.ill => prog8lib.p8} | 0 {testsource => python/testsource}/calls.ill | 0 {testsource => python/testsource}/conditionals.ill | 0 {testsource => python/testsource}/dtypes.ill | 0 {testsource => python/testsource}/floats.ill | 0 {testsource => python/testsource}/included.binary | Bin {testsource => python/testsource}/included.source | 0 {testsource => python/testsource}/input.ill | 0 {testsource => python/testsource}/large.ill | 0 {testsource => python/testsource}/numbergame.ill | 0 {testsource => python/testsource}/source1.ill | 0 {testsource => python/testsource}/source2.ill | 0 {testsource => python/testsource}/source3.ill | 0 {testsource => python/testsource}/source4.ill | 0 {testsource => python/testsource}/todo.ill | 0 {testsource => python/testsource}/todo2.ill | 0 27 files changed, 8 insertions(+), 6 deletions(-) rename compiler/examples/{imported.ill => imported.p8} (100%) rename compiler/examples/{imported2.ill => imported2.p8} (100%) rename compiler/examples/{numbergame.ill => numbergame.p8} (100%) rename compiler/examples/{test.ill => test.p8} (100%) rename prog8lib/{c64lib.ill => c64lib.p8} (100%) rename prog8lib/{mathlib.ill => mathlib.p8} (100%) rename prog8lib/{prog8lib.ill => prog8lib.p8} (100%) rename {testsource => python/testsource}/calls.ill (100%) rename {testsource => python/testsource}/conditionals.ill (100%) rename {testsource => python/testsource}/dtypes.ill (100%) rename {testsource => python/testsource}/floats.ill (100%) rename {testsource => python/testsource}/included.binary (100%) rename {testsource => python/testsource}/included.source (100%) rename {testsource => python/testsource}/input.ill (100%) rename {testsource => python/testsource}/large.ill (100%) rename {testsource => python/testsource}/numbergame.ill (100%) rename {testsource => python/testsource}/source1.ill (100%) rename {testsource => python/testsource}/source2.ill (100%) rename {testsource => python/testsource}/source3.ill (100%) rename {testsource => python/testsource}/source4.ill (100%) rename {testsource => python/testsource}/todo.ill (100%) rename {testsource => python/testsource}/todo2.ill (100%) diff --git a/.gitignore b/.gitignore index 9591cee7b..8936c0d17 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,6 @@ parser.out parsetab.py .pytest_cache/ docs/build -out/ \ No newline at end of file +out/ +**/*.interp +**/*.tokens diff --git a/compiler/examples/imported.ill b/compiler/examples/imported.p8 similarity index 100% rename from compiler/examples/imported.ill rename to compiler/examples/imported.p8 diff --git a/compiler/examples/imported2.ill b/compiler/examples/imported2.p8 similarity index 100% rename from compiler/examples/imported2.ill rename to compiler/examples/imported2.p8 diff --git a/compiler/examples/numbergame.ill b/compiler/examples/numbergame.p8 similarity index 100% rename from compiler/examples/numbergame.ill rename to compiler/examples/numbergame.p8 diff --git a/compiler/examples/test.ill b/compiler/examples/test.p8 similarity index 100% rename from compiler/examples/test.ill rename to compiler/examples/test.p8 diff --git a/compiler/src/prog8/parser/ModuleParsing.kt b/compiler/src/prog8/parser/ModuleParsing.kt index a45260c4d..19c63710a 100644 --- a/compiler/src/prog8/parser/ModuleParsing.kt +++ b/compiler/src/prog8/parser/ModuleParsing.kt @@ -60,7 +60,7 @@ fun importModule(filePath: Path) : Module { fun discoverImportedModule(name: String, importedFrom: Path, position: Position?): Path { - val fileName = "$name.ill" + val fileName = "$name.p8" val locations = mutableListOf(Paths.get(importedFrom.parent.toString())) val propPath = System.getProperty("prog8.libdir") diff --git a/docs/source/building.rst b/docs/source/building.rst index fea5419a7..d7fbfaf8a 100644 --- a/docs/source/building.rst +++ b/docs/source/building.rst @@ -35,7 +35,7 @@ that assembles it into the final program. Module source code files ------------------------ -A module source file is a text file with the ``.ill`` suffix, containing the program's source code. +A module source file is a text file with the ``.p8`` suffix, containing the program's source code. It consists of compilation options and other directives, imports of other modules, and source code for one or more code blocks. diff --git a/docs/source/programming.rst b/docs/source/programming.rst index 4fb0b0370..0f3fca2b0 100644 --- a/docs/source/programming.rst +++ b/docs/source/programming.rst @@ -15,7 +15,7 @@ Program Consists of one or more *modules*. Module - A file on disk with the ``.ill`` suffix. It contains *directives* and *code blocks*. + A file on disk with the ``.p8`` suffix. It contains *directives* and *code blocks*. Whitespace and indentation in the source code are arbitrary and can be tabs or spaces or both. You can also add *comments* to the source code. One moudule file can *import* others, and also import *library modules*. @@ -246,7 +246,7 @@ Floats are stored in the 5-byte 'MFLPT' format that is used on CBM machines, and also most float operations are specific to the Commodore-64. This is because routines in the C-64 BASIC and KERNAL ROMs are used for that. So floating point operations will only work if the C-64 BASIC ROM (and KERNAL ROM) -are banked in (and your code imports the ``c64lib.ill``) +are banked in (and your code imports the ``c64lib.p8``) The largest 5-byte MFLPT float that can be stored is: **1.7014118345e+38** (negative: **-1.7014118345e+38**) diff --git a/docs/source/syntaxreference.rst b/docs/source/syntaxreference.rst index 621a49350..b729f84bc 100644 --- a/docs/source/syntaxreference.rst +++ b/docs/source/syntaxreference.rst @@ -7,7 +7,7 @@ Syntax Reference Module file ----------- -This is a file with the ``.ill`` suffix, containing *directives* and *code blocks*, described below. +This is a file with the ``.p8`` suffix, containing *directives* and *code blocks*, described below. The file is a text file wich can also contain: Lines, whitespace, indentation diff --git a/prog8lib/c64lib.ill b/prog8lib/c64lib.p8 similarity index 100% rename from prog8lib/c64lib.ill rename to prog8lib/c64lib.p8 diff --git a/prog8lib/mathlib.ill b/prog8lib/mathlib.p8 similarity index 100% rename from prog8lib/mathlib.ill rename to prog8lib/mathlib.p8 diff --git a/prog8lib/prog8lib.ill b/prog8lib/prog8lib.p8 similarity index 100% rename from prog8lib/prog8lib.ill rename to prog8lib/prog8lib.p8 diff --git a/testsource/calls.ill b/python/testsource/calls.ill similarity index 100% rename from testsource/calls.ill rename to python/testsource/calls.ill diff --git a/testsource/conditionals.ill b/python/testsource/conditionals.ill similarity index 100% rename from testsource/conditionals.ill rename to python/testsource/conditionals.ill diff --git a/testsource/dtypes.ill b/python/testsource/dtypes.ill similarity index 100% rename from testsource/dtypes.ill rename to python/testsource/dtypes.ill diff --git a/testsource/floats.ill b/python/testsource/floats.ill similarity index 100% rename from testsource/floats.ill rename to python/testsource/floats.ill diff --git a/testsource/included.binary b/python/testsource/included.binary similarity index 100% rename from testsource/included.binary rename to python/testsource/included.binary diff --git a/testsource/included.source b/python/testsource/included.source similarity index 100% rename from testsource/included.source rename to python/testsource/included.source diff --git a/testsource/input.ill b/python/testsource/input.ill similarity index 100% rename from testsource/input.ill rename to python/testsource/input.ill diff --git a/testsource/large.ill b/python/testsource/large.ill similarity index 100% rename from testsource/large.ill rename to python/testsource/large.ill diff --git a/testsource/numbergame.ill b/python/testsource/numbergame.ill similarity index 100% rename from testsource/numbergame.ill rename to python/testsource/numbergame.ill diff --git a/testsource/source1.ill b/python/testsource/source1.ill similarity index 100% rename from testsource/source1.ill rename to python/testsource/source1.ill diff --git a/testsource/source2.ill b/python/testsource/source2.ill similarity index 100% rename from testsource/source2.ill rename to python/testsource/source2.ill diff --git a/testsource/source3.ill b/python/testsource/source3.ill similarity index 100% rename from testsource/source3.ill rename to python/testsource/source3.ill diff --git a/testsource/source4.ill b/python/testsource/source4.ill similarity index 100% rename from testsource/source4.ill rename to python/testsource/source4.ill diff --git a/testsource/todo.ill b/python/testsource/todo.ill similarity index 100% rename from testsource/todo.ill rename to python/testsource/todo.ill diff --git a/testsource/todo2.ill b/python/testsource/todo2.ill similarity index 100% rename from testsource/todo2.ill rename to python/testsource/todo2.ill