From 21a3e761cc041b6f458b7b4269e93be525885a4c Mon Sep 17 00:00:00 2001 From: Simon Marchetto Date: Thu, 13 Mar 2014 11:36:50 +0100 Subject: [PATCH] scilab: in doc group together constants and enums --- Doc/Manual/Scilab.html | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/Doc/Manual/Scilab.html b/Doc/Manual/Scilab.html index 3f69a4f06..f5654940a 100644 --- a/Doc/Manual/Scilab.html +++ b/Doc/Manual/Scilab.html @@ -27,8 +27,7 @@
  • Identifiers
  • Functions
  • Global variables -
  • Constants -
  • Enums +
  • Constants and enums
  • Pointers
  • Structs
  • Arrays @@ -339,7 +338,7 @@ ans=24 -

    37.3.6 Global variables

    +

    37.3.4 Global variables

    @@ -359,7 +358,9 @@ c = 3 ans = 4 -

    37.3.7 Constants

    +

    37.3.5 Constants and enums

    + +

    Constants

    There is no constant in Scilab. By default, C/C++ constants are wrapped as getter functions. For example for the following constants: @@ -448,7 +449,7 @@ ans= 37 ans= 3.14 -

    37.3.8 Enums

    +

    Enums

    The wrapping of enums is quite the same as for constants. @@ -495,7 +496,7 @@ typedef enum { RED, BLUE, GREEN } color;

    -

    37.3.9 Pointers

    +

    37.3.6 Pointers

    @@ -543,7 +544,7 @@ extern int divide(int n, int d, int *r); we only need a real value instead.

    -

    37.3.10 Structs

    +

    37.3.7 Structs

    @@ -571,7 +572,7 @@ ans = 100 -

    37.3.11 Arrays

    +

    37.3.8 Arrays

    One-dimensional arrays are supported whether as global variables or functions arguments. @@ -630,7 +631,7 @@ And this C int array is automatically converted in output to a Scilab double vec

    -

    37.3.12 Matrices

    +

    37.3.9 Matrices

    Matrices can be implemented in several ways in C, here we focus on matrices implemented with pointer-to-pointer (ex: double**). @@ -706,7 +707,7 @@ void print_matrix(double **M, int nbRows, int nbCols) { -

    37.3.13 C++ Classes

    +

    37.3.10 C++ Classes

    The classes are wrapped in the same manner as structs, through functions. For example, the following class: @@ -740,14 +741,14 @@ ans = -

    37.3.14 C++ Templates

    +

    37.3.11 C++ Templates

    Templates are supported. See the SWIG general documentation on how templates are interfaced in SWIG.
    An example of templates can be found in Examples/scilab/templates.

    -

    37.3.15 C++ STL

    +

    37.3.12 C++ STL

    The Standard Template Library (STL) is partially supported. @@ -874,7 +875,12 @@ In that case, SWIG displays an error when wrapping a function that has long long

    The default mapped type for C/C++ non-primitive types is the Scilab pointer. That is the case for exemple for C structs, C++ classes, etc... -But there are many type mappings for non-primitive types (such as enums, arrays, STL types, etc...). Each of them is described further in this document. +

    + +

    37.4.2 Matrices typemaps

    + +

    +

    37.5 Module