/[svn]/linuxsampler/trunk/src/network/lscp.y
ViewVC logotype

Diff of /linuxsampler/trunk/src/network/lscp.y

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 4001 by schoenebeck, Mon Jun 8 11:55:18 2020 UTC revision 4002 by schoenebeck, Mon Nov 22 20:06:26 2021 UTC
# Line 1306  struct BisonSymbolInfo { Line 1306  struct BisonSymbolInfo {
1306      String nextExpectedChars; ///< According to current parser position: sequence of characters expected next for satisfying this grammar symbol.      String nextExpectedChars; ///< According to current parser position: sequence of characters expected next for satisfying this grammar symbol.
1307  };  };
1308    
1309  #if HAVE_BISON_MAJ >= 3 // Bison 3.x or younger ...  #if HAVE_BISON_MAJ >= 3 || !defined(HAVE_BISON_MAJ) // Bison 3.x or younger ...
1310    
1311  /**  /**
1312   * Must ONLY be called just before a so called "reduce" parser action:   * Must ONLY be called just before a so called "reduce" parser action:
# Line 1557  static void walkAndFillExpectedSymbols( Line 1557  static void walkAndFillExpectedSymbols(
1557          for (int i = 0; i < depth; ++i) printf("\t");          for (int i = 0; i < depth; ++i) printf("\t");
1558          printf("(default reduction)\n");          printf("(default reduction)\n");
1559  #endif  #endif
1560          #if HAVE_BISON_MAJ >= 3          #if HAVE_BISON_MAJ >= 3 || !defined(HAVE_BISON_MAJ)
1561          if (!nextExpectedChars.empty() || !_isRuleTerminalSymbol(n, stack)) {          if (!nextExpectedChars.empty() || !_isRuleTerminalSymbol(n, stack)) {
1562          #else          #else
1563          if (!nextExpectedChars.empty() || !_isRuleTerminalSymbol(n)) {          if (!nextExpectedChars.empty() || !_isRuleTerminalSymbol(n)) {
# Line 1568  static void walkAndFillExpectedSymbols( Line 1568  static void walkAndFillExpectedSymbols(
1568              bool ambigious =              bool ambigious =
1569                  expectedSymbols.count(yytname[yyr1[n]]) &&                  expectedSymbols.count(yytname[yyr1[n]]) &&
1570                  expectedSymbols[yytname[yyr1[n]]].nextExpectedChars != nextExpectedChars;                  expectedSymbols[yytname[yyr1[n]]].nextExpectedChars != nextExpectedChars;
1571              #if HAVE_BISON_MAJ >= 3              #if HAVE_BISON_MAJ >= 3 || !defined(HAVE_BISON_MAJ)
1572              expectedSymbols[yytname[yyr1[n]]] = _symbolInfoForRule(n, stack, nextExpectedChars);              expectedSymbols[yytname[yyr1[n]]] = _symbolInfoForRule(n, stack, nextExpectedChars);
1573              #else              #else
1574              expectedSymbols[yytname[yyr1[n]]] = _symbolInfoForRule(n, nextExpectedChars);              expectedSymbols[yytname[yyr1[n]]] = _symbolInfoForRule(n, nextExpectedChars);
# Line 1700  static void walkAndFillExpectedSymbols( Line 1700  static void walkAndFillExpectedSymbols(
1700          bool ambigious =          bool ambigious =
1701              expectedSymbols.count(yytname[yyr1[rule]]) &&              expectedSymbols.count(yytname[yyr1[rule]]) &&
1702              expectedSymbols[yytname[yyr1[rule]]].nextExpectedChars != nextExpectedChars;              expectedSymbols[yytname[yyr1[rule]]].nextExpectedChars != nextExpectedChars;
1703          #if HAVE_BISON_MAJ >= 3          #if HAVE_BISON_MAJ >= 3 || !defined(HAVE_BISON_MAJ)
1704          expectedSymbols[yytname[yyr1[rule]]] = _symbolInfoForRule(rule, stack, nextExpectedChars);          expectedSymbols[yytname[yyr1[rule]]] = _symbolInfoForRule(rule, stack, nextExpectedChars);
1705          #else          #else
1706          expectedSymbols[yytname[yyr1[rule]]] = _symbolInfoForRule(rule, nextExpectedChars);          expectedSymbols[yytname[yyr1[rule]]] = _symbolInfoForRule(rule, nextExpectedChars);
Legend:
Removed from v.4001  
changed lines
  Added in v.4002
  ViewVC Help
Powered by ViewVC