From 7cb448d360d3a535bc5649affbfc42eb7548b263 Mon Sep 17 00:00:00 2001 From: gregj Date: Mon, 4 May 2020 11:30:50 -0600 Subject: [PATCH 1/3] Fix internal links to make HTML export work --- ferret.org | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ferret.org b/ferret.org index 2ad93d0..ea931d9 100644 --- a/ferret.org +++ b/ferret.org @@ -208,7 +208,7 @@ takes the Ferret code and converts it to a Intermediate representation by taking the Ferret form and running it [[Compilation][through some transformations]]. This IR is then run through [[Code Generation]] module to create C++ code. [[*Runtime][Runtime]] contains the C++ runtime needed to support -Ferret such as [[Object System]], [[Memory Pool][Memory Pooling]], [[Reference Counting][Garbage Collection]]. It +Ferret such as [[Object System]], [[Memory Management][Memory Pooling]], [[Reference Counting][Garbage Collection]]. It is written in a mixture of C++ and Ferret DSL. [[*Core][Core]] is the standard library of Ferret, provides a ton of general-purpose functionality for writing robust, maintainable embedded applications. @@ -2466,7 +2466,7 @@ Common I/O operations. * Runtime -Runtime needed to support [[*Core][Core]]. [[Object System][Object system]], [[*Memory%20Management][Memory Management]] etc. +Runtime needed to support [[*Core][Core]]. [[Object System][Object system]], [[*Memory Management][Memory Management]] etc. ** Object System *** Base @@ -2474,7 +2474,7 @@ Runtime needed to support [[*Core][Core]]. [[Object System][Object system]], [[* All our types are derived from the base Object type. Which is a =typedef= of =obj::base=. See [[Reference Counting]] for available reference counting policies and -[[Memory Allocation]] for available allocation policies. +[[Allocators][Memory Allocation]] for available allocation policies. #+begin_src c++ :tangle no :noweb-ref runtime-native-object template @@ -2856,7 +2856,7 @@ typedef value matrix_t; The number type represents real (double-precision floating-point) numbers. Ferret has no integer type. On systems without hardware support for floating point Ferret programs can be configured to use -fixed point numbers. (See [[Numeric%20Tower][Numeric Tower]] runtime.) +fixed point numbers. (See [[Numeric Tower]] runtime.) #+begin_src clojure :tangle no :noweb-ref runtime-clojure-objects (defobject number "number_o.h") @@ -4551,7 +4551,7 @@ libgc.{a,so}. **** System -[[Object]]s are allocated from system implementation. (Default memory +[[Objects]] are allocated from system implementation. (Default memory allocator used.) #+begin_src c++ :tangle no :noweb-ref runtime-native-allocators @@ -6659,7 +6659,7 @@ over first. ** Sequential *** list -Creates a new list. See also [[Special%20Forms][Spacial Forms]]. +Creates a new list. See also [[Special Forms]]. #+begin_src clojure :tangle no :noweb-ref ferret-unit-test-sequence (deftest list-test From 87f7a8f1b2b8c5ff306b6c292b68da29f4b0933d Mon Sep 17 00:00:00 2001 From: gregj Date: Mon, 4 May 2020 11:32:04 -0600 Subject: [PATCH 2/3] Fix options syntax for org-babel --- ferret.org | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ferret.org b/ferret.org index ea931d9..fa63661 100644 --- a/ferret.org +++ b/ferret.org @@ -10751,10 +10751,15 @@ Valgrind options, * Files :noexport: #+name: ferret-version -#+begin_src sh :exports results noweb: yes +#+begin_src sh :exports both :results replace :noweb yes echo "`git describe --abbrev=0 --tags`-`git rev-parse --short HEAD`" #+end_src +#+RESULTS: ferret-version +: 0.4.0-171a575 + + + ** project.clj #+begin_src clojure :mkdirp yes :noweb yes :tangle project.clj From 9c9617e8c96e01d37e5060096e984046269b324f Mon Sep 17 00:00:00 2001 From: gregj Date: Mon, 4 May 2020 11:33:57 -0600 Subject: [PATCH 3/3] Make NAME property amenable to org-babel --- ferret.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ferret.org b/ferret.org index fa63661..498888e 100644 --- a/ferret.org +++ b/ferret.org @@ -474,7 +474,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Ferret has a similar architecture to other modern compilers, #+CAPTION: Ferret Compiler Architecture -#+NAME: fig:compiler_architecture +#+NAME: fig_compiler_architecture [[./ferret-styles/graphs/compiler_arch.png]] First, an input file containing Ferret code is loaded from the