Changeset 1230 for cpp/frams/genetics/f4/f4_general.h

Timestamp:

05/01/23 02:14:27 (12 months ago)

Author:

Maciej Komosinski

Message:

Got rid of the (buggy) look-ahead function, made parsing stricter and simpler

File:

• cpp/frams/genetics/f4/f4_general.h (modified) (2 diffs)

cpp/frams/genetics/f4/f4_general.h

@@ -40 +40 @@
 #define CELL_NEURON 42 ///<differentiated to neuron, can divide
 //@}
-
-/**
- * TODO MacKo 2023-04: not sure if this function is needed and if f4_processRecur() would not suffice
- * if it advanced the string pointer (in/out parameter) while processing. Its returned value is always used after
- * f4_processRecur() anyway, and in two cases likely incorrectly (for [...] to detect closing ']'
- * and for :...: to detect closing ':') - we don't need recursion in these cases, a simple linear
- * scan would suffice, but even this would not be needed - since we are parsing the actual characters in these cases,
- * we do scanning anyway. So looks like this function doubles the work already done more thoroughly by f4_processRecur().
- * 
- * Scans f4 genotype string for a stopping character and returns the position of
- * this stopping character or 1 if the end of string was reached. This method is used
- * for closing braces, like ), >, ]. It runs recursively when opening braces
- * like (, <, # are found.
- * @param s string with the f4 genotype
- * @param slen length of a given string
- * @param stopchar character to be found
- * @return 1 if end of string was reached, or position of found character in sequence
- */
-int scanRecur(const char* s, int slen, char stopchar);
 
 
@@ -501 +482 @@
  * @return 0 if processing was successful, otherwise returns the position of an error in the genotype
  */
-int f4_processRecur(const char *genot, unsigned int pos0, f4_Node *parent);
+int f4_processRecur(const char *genot, int &pos_inout, f4_Node *parent);
 
 /**