Ticket #30494: symmetrica-xcode12.patch

File symmetrica-xcode12.patch, 5.6 KB (added by John Palmieri, 2 years ago)

Attempting to patch symmetrica to build with Xcode 12

  • hiccup.c

    diff --git a/hiccup.c b/hiccup.c
    index 0cf18b0..1fa468d 100644
    a b static OP children=NULL; /* AK 150197 */ 
    4545        INT substitute_one_matrix (OP mat);
    4646        INT substitute_one_monopoly (OP mp);
    4747
    48         INT set_garnir_parameters (OP partition);
    49         INT free_garnir_parameters (void);
     48        static INT set_garnir_parameters (OP partition);
     49        static INT free_garnir_parameters (void);
    5050        INT set_useful_monopolies (void);
    5151        INT free_useful_monopolies (void);
    5252        set_multiplier (OP extra);
    static OP children=NULL; /* AK 150197 */ 
    5757        INT column_standardise_tableau (OP tableau, INT col, INT *sig);
    5858        static int standardise_tableau_list (OP list, OP expression);
    5959        static int standardise_tableau (OP tableau, OP expression);
    60         garnir_juggle (OP tableau, INT power, INT coeff);
     60        static int garnir_juggle (OP tableau, INT power, INT coeff);
    6161        static garnir_generate (INT head, INT wag);
    6262        static garnir_result (OP tableau, OP mp_coeff, OP acc_list);
    6363        INT enter_list_to_matrix (OP matrix, INT column, OP standard, OP express);
    static OP children=NULL; /* AK 150197 */ 
    7777        INT set_root_parameters (OP partition, OP p_root);
    7878        INT free_root_parameters (void);
    7979        INT find_non_root_standard_pos (OP tableau);
    80         set_root_multiplier (OP extra);
    81         root_standardise_tableau_list (OP list, OP expression);
    82         root_standardise_tableau (OP tableau, OP expression);
    83         root_juggle (OP tableau, INT power, INT coeff);
    84         strip_juggle (OP tableau, INT power, INT coeff);
    85         root_garnir_result (OP tableau, OP mp_coeff, OP acc_list);
     80        INT set_root_multiplier (OP extra);
     81        INT root_standardise_tableau_list (OP list, OP expression);
     82        INT root_standardise_tableau (OP tableau, OP expression);
     83        INT root_juggle (OP tableau, INT power, INT coeff);
     84        INT strip_juggle (OP tableau, INT power, INT coeff);
     85        INT root_garnir_result (OP tableau, OP mp_coeff, OP acc_list);
    8686        INT root_normalise_monopoly (OP mono);
    87         generate_sym_tableaux_list (INT piece, OP sym_list);
    88         coset_generate (INT head, INT wag);
     87        INT generate_sym_tableaux_list (INT piece, OP sym_list);
     88        INT coset_generate (INT head, INT wag);
    8989        INT remove_mp_qnumber_fac (OP mp, INT qn);
    9090        INT remove_vec_qnumber (INT qn);
    9191
    INT find_non_root_standard_pos (tableau) OP tableau; 
    20912091}
    20922092
    20932093
    2094 set_root_multiplier (extra) OP extra;
     2094INT set_root_multiplier (extra) OP extra;
    20952095
    20962096/* all standard tableaux that are now found are added to the list
    20972097      after their coefficients have been multiplied by extra
    set_root_multiplier (extra) OP extra; 
    21032103}
    21042104
    21052105
    2106 root_standardise_tableau_list ( list,  expression)
     2106INT root_standardise_tableau_list ( list,  expression)
    21072107        OP list;
    21082108        OP expression;
    21092109
    root_standardise_tableau_list ( list, expression) 
    21242124}
    21252125
    21262126
    2127 root_standardise_tableau ( tableau,  expression)
     2127INT root_standardise_tableau ( tableau,  expression)
    21282128        OP tableau;
    21292129        OP expression;
    21302130
    root_standardise_tableau ( tableau, expression) 
    21682168}
    21692169
    21702170
    2171 root_juggle ( tableau,  power,  coeff)
     2171INT root_juggle ( tableau,  power,  coeff)
    21722172        OP tableau;
    21732173        INT power;
    21742174        INT coeff;
    root_juggle ( tableau, power, coeff) 
    22612261}
    22622262
    22632263
    2264 strip_juggle (tableau, power, coeff)
     2264INT strip_juggle (tableau, power, coeff)
    22652265        OP tableau;
    22662266        INT power;
    22672267        INT coeff;
    strip_juggle (tableau, power, coeff) 
    26442644#if NORMALISE == 1          /* include if we want resultant coefficients
    26452645tidied up with respect to the root of unity */
    26462646
    2647 root_garnir_result ( tableau,  mp_coeff,  acc_list)
     2647INT root_garnir_result ( tableau,  mp_coeff,  acc_list)
    26482648        OP tableau;
    26492649        OP mp_coeff;
    26502650        OP acc_list;
    there: 
    28052805#endif          /* for NORMALISE */
    28062806
    28072807
    2808 generate_sym_tableaux_list (piece, sym_list)
     2808INT generate_sym_tableaux_list (piece, sym_list)
    28092809        INT piece;
    28102810        OP sym_list;
    28112811
    generate_sym_tableaux_list (piece, sym_list) 
    28882888}
    28892889
    28902890
    2891 coset_generate (head, wag) INT head; INT wag;
     2891INT coset_generate (head, wag) INT head; INT wag;
    28922892
    28932893/* Recursive function which creates all the terms in the coset.
    28942894   Method is much the same as that used for garnir_generate().
  • def.h

    diff --git a/def.h b/def.h
    index 5762481..372fb83 100644
    a b extern INT cast_apply_perm(); 
    804804extern INT cast_apply_polynom();
    805805extern INT cast_apply_powsym();
    806806extern INT cast_apply_schur();
     807extern INT cast_apply_schubert();
    807808extern INT cast_apply_tableaux();
    808809extern INT cast_elmsym();
    809810extern INT cast_homsym();
    extern INT intlog_longint(); 
    15741575extern INT invers();
    15751576extern INT invers_apply();
    15761577extern INT invers_apply_bruch();
     1578extern INT invers_apply_ff();
    15771579extern INT invers_apply_integer();
    15781580extern INT invers_apply_longint();
    15791581extern INT invers_bar();
    extern OP s_w_s(); 
    32913292extern INT S_wt();
    32923293extern INT s_x_nu_to_ypolynom();
    32933294extern INT symchar_hoch_n();
     3295extern INT SYM_isdigit();
    32943296extern INT SYMMETRICA_bricknumber();
    32953297extern INT SYMMETRICA_EH();
    32963298extern INT SYMMETRICA_EM();
  • lo.c

    diff --git a/lo.c b/lo.c
    index f649e56..56b27c0 100644
    a b static INT ganzfziffer(); 
    4343/* static INT ganzhalf(); */
    4444static INT ganzint();
    4545static INT ganzkopiere();
    46 /* static INT ganzloesche(); */
     46static INT ganzloesche();
    4747/* static INT ganzmod(); */
    4848static INT ganzmul();
    4949/* static INT ganzneg(); */
  • mo.c

    diff --git a/mo.c b/mo.c
    index fdba713..6fdec48 100644
    a b INT tl_set_index_inc(p) INT p; 
    14091404#define PRIME  9973 /*  40993  */
    14101405#define INDEX_INC 1
    14111406#define MAX_NUMB 8
    1412 TL_BYTE *mat_table[PRIME];
    1413 TL_2BYTE *koeff_table[PRIME];
    1414 INT mat_length[PRIME];
     1407static TL_BYTE **mat_table;
     1408static TL_2BYTE **koeff_table;
     1409static INT *mat_length;
    14151410#endif
    14161411
    14171412static init_mat()