1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 19:50:24 +02:00

Merge api-{data,compound}.texi

* doc/ref/api-compound.texi: Remove.
* doc/ref/api-data.texi: Fold "Compound Data Types" and "Simple Data
  Types" into just "Data Types".  The distinction didn't work.
* doc/ref/guile.texi:
* doc/ref/Makefile.am:
* doc/ref/srfi-modules.texi: Adapt.
This commit is contained in:
Andy Wingo 2016-11-22 23:11:37 +01:00
parent 2b0ffb899b
commit 8b5f323330
5 changed files with 4484 additions and 4541 deletions

View file

@ -75,7 +75,6 @@ guile_TEXINFOS = preface.texi \
r6rs.texi \ r6rs.texi \
match.texi \ match.texi \
misc-modules.texi \ misc-modules.texi \
api-compound.texi \
libguile-autoconf.texi \ libguile-autoconf.texi \
autoconf-macros.texi \ autoconf-macros.texi \
tools.texi \ tools.texi \

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -297,8 +297,7 @@ available through both Scheme and C interfaces.
* The SCM Type:: The fundamental data type for C code. * The SCM Type:: The fundamental data type for C code.
* Initialization:: Initializing Guile. * Initialization:: Initializing Guile.
* Snarfing Macros:: Macros for snarfing initialization actions. * Snarfing Macros:: Macros for snarfing initialization actions.
* Simple Data Types:: Numbers, strings, booleans and so on. * Data Types:: Representing values in Guile.
* Compound Data Types:: Data types for holding other data.
* Foreign Objects:: Defining new data types in C. * Foreign Objects:: Defining new data types in C.
* Smobs:: Use foreign objects instead. * Smobs:: Use foreign objects instead.
* Procedures:: Procedures. * Procedures:: Procedures.
@ -328,7 +327,6 @@ available through both Scheme and C interfaces.
@include api-init.texi @include api-init.texi
@include api-snarf.texi @include api-snarf.texi
@include api-data.texi @include api-data.texi
@include api-compound.texi
@include api-foreign-objects.texi @include api-foreign-objects.texi
@include api-smobs.texi @include api-smobs.texi
@include api-procedures.texi @include api-procedures.texi

View file

@ -1823,8 +1823,8 @@ procedures easier. It is documented in @xref{Multiple Values}.
This SRFI is a syntax for defining new record types and creating This SRFI is a syntax for defining new record types and creating
predicate, constructor, and field getter and setter functions. It is predicate, constructor, and field getter and setter functions. It is
documented in the ``Compound Data Types'' section of the manual documented in the ``Data Types'' section of the manual (@pxref{SRFI-9
(@pxref{SRFI-9 Records}). Records}).
@node SRFI-10 @node SRFI-10