2014-05-03 18:27:38 -04:00
|
|
|
/*
|
2017-06-30 03:22:17 -04:00
|
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
2014-05-03 18:27:38 -04:00
|
|
|
*
|
|
|
|
* The MIT License (MIT)
|
|
|
|
*
|
2017-12-25 21:39:02 -05:00
|
|
|
* Copyright (c) 2013-2017 Damien P. George
|
2014-05-03 18:27:38 -04:00
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
2014-03-16 03:14:26 -04:00
|
|
|
#include <stdbool.h>
|
2013-10-04 14:53:11 -04:00
|
|
|
#include <stdint.h>
|
|
|
|
#include <stdio.h>
|
2016-01-08 08:42:00 -05:00
|
|
|
#include <unistd.h> // for ssize_t
|
2013-10-04 14:53:11 -04:00
|
|
|
#include <assert.h>
|
2014-05-25 17:06:06 -04:00
|
|
|
#include <string.h>
|
2013-10-04 14:53:11 -04:00
|
|
|
|
2015-01-01 15:27:54 -05:00
|
|
|
#include "py/lexer.h"
|
|
|
|
#include "py/parse.h"
|
|
|
|
#include "py/parsenum.h"
|
2015-10-08 09:58:15 -04:00
|
|
|
#include "py/runtime.h"
|
2016-01-07 09:40:35 -05:00
|
|
|
#include "py/objint.h"
|
2017-02-23 21:43:43 -05:00
|
|
|
#include "py/objstr.h"
|
2015-10-08 09:58:15 -04:00
|
|
|
#include "py/builtin.h"
|
2013-10-04 14:53:11 -04:00
|
|
|
|
2015-12-18 07:35:44 -05:00
|
|
|
#if MICROPY_ENABLE_COMPILER
|
|
|
|
|
2013-10-04 14:53:11 -04:00
|
|
|
#define RULE_ACT_ARG_MASK (0x0f)
|
2014-12-20 13:37:50 -05:00
|
|
|
#define RULE_ACT_KIND_MASK (0x30)
|
|
|
|
#define RULE_ACT_ALLOW_IDENT (0x40)
|
|
|
|
#define RULE_ACT_ADD_BLANK (0x80)
|
2013-10-04 14:53:11 -04:00
|
|
|
#define RULE_ACT_OR (0x10)
|
|
|
|
#define RULE_ACT_AND (0x20)
|
|
|
|
#define RULE_ACT_LIST (0x30)
|
|
|
|
|
|
|
|
#define RULE_ARG_KIND_MASK (0xf000)
|
|
|
|
#define RULE_ARG_ARG_MASK (0x0fff)
|
|
|
|
#define RULE_ARG_TOK (0x1000)
|
|
|
|
#define RULE_ARG_RULE (0x2000)
|
2015-04-21 12:43:18 -04:00
|
|
|
#define RULE_ARG_OPT_RULE (0x3000)
|
2013-10-04 14:53:11 -04:00
|
|
|
|
2020-02-25 19:58:42 -05:00
|
|
|
// *FORMAT-OFF*
|
|
|
|
|
2013-10-04 14:53:11 -04:00
|
|
|
enum {
|
2017-02-14 18:58:05 -05:00
|
|
|
// define rules with a compile function
|
2014-01-22 19:00:53 -05:00
|
|
|
#define DEF_RULE(rule, comp, kind, ...) RULE_##rule,
|
2017-02-14 18:58:05 -05:00
|
|
|
#define DEF_RULE_NC(rule, kind, ...)
|
2015-01-01 15:27:54 -05:00
|
|
|
#include "py/grammar.h"
|
2013-10-04 14:53:11 -04:00
|
|
|
#undef DEF_RULE
|
2017-02-14 18:58:05 -05:00
|
|
|
#undef DEF_RULE_NC
|
2015-02-07 20:57:40 -05:00
|
|
|
RULE_const_object, // special node for a constant, generic Python object
|
2017-02-14 18:58:05 -05:00
|
|
|
|
|
|
|
// define rules without a compile function
|
|
|
|
#define DEF_RULE(rule, comp, kind, ...)
|
|
|
|
#define DEF_RULE_NC(rule, kind, ...) RULE_##rule,
|
|
|
|
#include "py/grammar.h"
|
|
|
|
#undef DEF_RULE
|
|
|
|
#undef DEF_RULE_NC
|
2013-10-04 14:53:11 -04:00
|
|
|
};
|
|
|
|
|
2017-12-23 07:36:08 -05:00
|
|
|
// Define an array of actions corresponding to each rule
|
|
|
|
STATIC const uint8_t rule_act_table[] = {
|
2013-10-04 14:53:11 -04:00
|
|
|
#define or(n) (RULE_ACT_OR | n)
|
|
|
|
#define and(n) (RULE_ACT_AND | n)
|
2016-04-14 08:23:50 -04:00
|
|
|
#define and_ident(n) (RULE_ACT_AND | n | RULE_ACT_ALLOW_IDENT)
|
|
|
|
#define and_blank(n) (RULE_ACT_AND | n | RULE_ACT_ADD_BLANK)
|
2013-10-04 14:53:11 -04:00
|
|
|
#define one_or_more (RULE_ACT_LIST | 2)
|
|
|
|
#define list (RULE_ACT_LIST | 1)
|
|
|
|
#define list_with_end (RULE_ACT_LIST | 3)
|
2017-12-23 07:36:08 -05:00
|
|
|
|
|
|
|
#define DEF_RULE(rule, comp, kind, ...) kind,
|
|
|
|
#define DEF_RULE_NC(rule, kind, ...)
|
2015-01-01 15:27:54 -05:00
|
|
|
#include "py/grammar.h"
|
2017-12-23 07:36:08 -05:00
|
|
|
#undef DEF_RULE
|
|
|
|
#undef DEF_RULE_NC
|
|
|
|
|
|
|
|
0, // RULE_const_object
|
|
|
|
|
|
|
|
#define DEF_RULE(rule, comp, kind, ...)
|
|
|
|
#define DEF_RULE_NC(rule, kind, ...) kind,
|
|
|
|
#include "py/grammar.h"
|
|
|
|
#undef DEF_RULE
|
|
|
|
#undef DEF_RULE_NC
|
|
|
|
|
2013-10-04 14:53:11 -04:00
|
|
|
#undef or
|
|
|
|
#undef and
|
2017-12-23 07:36:08 -05:00
|
|
|
#undef and_ident
|
|
|
|
#undef and_blank
|
|
|
|
#undef one_or_more
|
2013-10-04 14:53:11 -04:00
|
|
|
#undef list
|
|
|
|
#undef list_with_end
|
2017-12-23 07:36:08 -05:00
|
|
|
};
|
|
|
|
|
2017-12-25 21:39:02 -05:00
|
|
|
// Define the argument data for each rule, as a combined array
|
|
|
|
STATIC const uint16_t rule_arg_combined_table[] = {
|
2017-12-23 07:36:08 -05:00
|
|
|
#define tok(t) (RULE_ARG_TOK | MP_TOKEN_##t)
|
|
|
|
#define rule(r) (RULE_ARG_RULE | RULE_##r)
|
|
|
|
#define opt_rule(r) (RULE_ARG_OPT_RULE | RULE_##r)
|
|
|
|
|
2017-12-25 21:39:02 -05:00
|
|
|
#define DEF_RULE(rule, comp, kind, ...) __VA_ARGS__,
|
|
|
|
#define DEF_RULE_NC(rule, kind, ...)
|
|
|
|
#include "py/grammar.h"
|
|
|
|
#undef DEF_RULE
|
|
|
|
#undef DEF_RULE_NC
|
|
|
|
|
|
|
|
#define DEF_RULE(rule, comp, kind, ...)
|
|
|
|
#define DEF_RULE_NC(rule, kind, ...) __VA_ARGS__,
|
2017-12-23 07:36:08 -05:00
|
|
|
#include "py/grammar.h"
|
|
|
|
#undef DEF_RULE
|
|
|
|
#undef DEF_RULE_NC
|
|
|
|
|
2013-10-04 14:53:11 -04:00
|
|
|
#undef tok
|
|
|
|
#undef rule
|
|
|
|
#undef opt_rule
|
2017-12-25 21:39:02 -05:00
|
|
|
};
|
|
|
|
|
2017-12-28 08:53:57 -05:00
|
|
|
// Macro to create a list of N identifiers where N is the number of variable arguments to the macro
|
|
|
|
#define RULE_EXPAND(x) x
|
2017-12-25 21:39:02 -05:00
|
|
|
#define RULE_PADDING(rule, ...) RULE_PADDING2(rule, __VA_ARGS__, RULE_PADDING_IDS(rule))
|
2017-12-28 08:53:57 -05:00
|
|
|
#define RULE_PADDING2(rule, ...) RULE_EXPAND(RULE_PADDING3(rule, __VA_ARGS__))
|
2019-07-24 23:15:54 -04:00
|
|
|
#define RULE_PADDING3(rule, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, ...) __VA_ARGS__
|
|
|
|
#define RULE_PADDING_IDS(r) PAD13_##r, PAD12_##r, PAD11_##r, PAD10_##r, PAD9_##r, PAD8_##r, PAD7_##r, PAD6_##r, PAD5_##r, PAD4_##r, PAD3_##r, PAD2_##r, PAD1_##r,
|
2017-12-25 21:39:02 -05:00
|
|
|
|
2017-12-28 08:53:57 -05:00
|
|
|
// Use an enum to create constants specifying how much room a rule takes in rule_arg_combined_table
|
2017-12-25 21:39:02 -05:00
|
|
|
enum {
|
2017-12-28 08:53:57 -05:00
|
|
|
#define DEF_RULE(rule, comp, kind, ...) RULE_PADDING(rule, __VA_ARGS__)
|
2017-12-25 21:39:02 -05:00
|
|
|
#define DEF_RULE_NC(rule, kind, ...)
|
|
|
|
#include "py/grammar.h"
|
|
|
|
#undef DEF_RULE
|
|
|
|
#undef DEF_RULE_NC
|
|
|
|
#define DEF_RULE(rule, comp, kind, ...)
|
2017-12-28 08:53:57 -05:00
|
|
|
#define DEF_RULE_NC(rule, kind, ...) RULE_PADDING(rule, __VA_ARGS__)
|
2017-12-25 21:39:02 -05:00
|
|
|
#include "py/grammar.h"
|
|
|
|
#undef DEF_RULE
|
|
|
|
#undef DEF_RULE_NC
|
|
|
|
};
|
2013-10-04 14:53:11 -04:00
|
|
|
|
2017-12-28 08:53:57 -05:00
|
|
|
// Macro to compute the start of a rule in rule_arg_combined_table
|
|
|
|
#define RULE_ARG_OFFSET(rule, ...) RULE_ARG_OFFSET2(rule, __VA_ARGS__, RULE_ARG_OFFSET_IDS(rule))
|
|
|
|
#define RULE_ARG_OFFSET2(rule, ...) RULE_EXPAND(RULE_ARG_OFFSET3(rule, __VA_ARGS__))
|
2019-07-24 23:15:54 -04:00
|
|
|
#define RULE_ARG_OFFSET3(rule, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, ...) _14
|
|
|
|
#define RULE_ARG_OFFSET_IDS(r) PAD13_##r, PAD12_##r, PAD11_##r, PAD10_##r, PAD9_##r, PAD8_##r, PAD7_##r, PAD6_##r, PAD5_##r, PAD4_##r, PAD3_##r, PAD2_##r, PAD1_##r, PAD0_##r,
|
2017-12-28 08:53:57 -05:00
|
|
|
|
2017-12-25 21:39:02 -05:00
|
|
|
// Use the above enum values to create a table of offsets for each rule's arg
|
|
|
|
// data, which indexes rule_arg_combined_table. The offsets require 9 bits of
|
|
|
|
// storage but only the lower 8 bits are stored here. The 9th bit is computed
|
|
|
|
// in get_rule_arg using the FIRST_RULE_WITH_OFFSET_ABOVE_255 constant.
|
|
|
|
STATIC const uint8_t rule_arg_offset_table[] = {
|
2017-12-28 08:53:57 -05:00
|
|
|
#define DEF_RULE(rule, comp, kind, ...) RULE_ARG_OFFSET(rule, __VA_ARGS__) & 0xff,
|
2017-02-14 18:58:05 -05:00
|
|
|
#define DEF_RULE_NC(rule, kind, ...)
|
|
|
|
#include "py/grammar.h"
|
|
|
|
#undef DEF_RULE
|
|
|
|
#undef DEF_RULE_NC
|
2017-12-25 21:39:02 -05:00
|
|
|
0, // RULE_const_object
|
2017-02-14 18:58:05 -05:00
|
|
|
#define DEF_RULE(rule, comp, kind, ...)
|
2017-12-28 08:53:57 -05:00
|
|
|
#define DEF_RULE_NC(rule, kind, ...) RULE_ARG_OFFSET(rule, __VA_ARGS__) & 0xff,
|
2015-01-01 15:27:54 -05:00
|
|
|
#include "py/grammar.h"
|
2013-10-04 14:53:11 -04:00
|
|
|
#undef DEF_RULE
|
2017-02-14 18:58:05 -05:00
|
|
|
#undef DEF_RULE_NC
|
2013-10-04 14:53:11 -04:00
|
|
|
};
|
|
|
|
|
2017-12-25 21:39:02 -05:00
|
|
|
// Define a constant that's used to determine the 9th bit of the values in rule_arg_offset_table
|
|
|
|
static const size_t FIRST_RULE_WITH_OFFSET_ABOVE_255 =
|
2017-12-28 08:53:57 -05:00
|
|
|
#define DEF_RULE(rule, comp, kind, ...) RULE_ARG_OFFSET(rule, __VA_ARGS__) >= 0x100 ? RULE_##rule :
|
2017-12-25 21:39:02 -05:00
|
|
|
#define DEF_RULE_NC(rule, kind, ...)
|
|
|
|
#include "py/grammar.h"
|
|
|
|
#undef DEF_RULE
|
|
|
|
#undef DEF_RULE_NC
|
|
|
|
#define DEF_RULE(rule, comp, kind, ...)
|
2017-12-28 08:53:57 -05:00
|
|
|
#define DEF_RULE_NC(rule, kind, ...) RULE_ARG_OFFSET(rule, __VA_ARGS__) >= 0x100 ? RULE_##rule :
|
2017-12-25 21:39:02 -05:00
|
|
|
#include "py/grammar.h"
|
|
|
|
#undef DEF_RULE
|
|
|
|
#undef DEF_RULE_NC
|
|
|
|
0;
|
|
|
|
|
2020-09-30 09:34:42 -04:00
|
|
|
#if MICROPY_DEBUG_PARSE_RULE_NAME
|
2017-12-23 07:04:02 -05:00
|
|
|
// Define an array of rule names corresponding to each rule
|
|
|
|
STATIC const char *const rule_name_table[] = {
|
|
|
|
#define DEF_RULE(rule, comp, kind, ...) #rule,
|
|
|
|
#define DEF_RULE_NC(rule, kind, ...)
|
|
|
|
#include "py/grammar.h"
|
|
|
|
#undef DEF_RULE
|
|
|
|
#undef DEF_RULE_NC
|
|
|
|
"", // RULE_const_object
|
|
|
|
#define DEF_RULE(rule, comp, kind, ...)
|
|
|
|
#define DEF_RULE_NC(rule, kind, ...) #rule,
|
|
|
|
#include "py/grammar.h"
|
|
|
|
#undef DEF_RULE
|
|
|
|
#undef DEF_RULE_NC
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
2020-02-25 19:58:42 -05:00
|
|
|
// *FORMAT-ON*
|
|
|
|
|
2013-10-04 14:53:11 -04:00
|
|
|
typedef struct _rule_stack_t {
|
2020-02-26 23:35:22 -05:00
|
|
|
size_t src_line : (8 * sizeof(size_t) - 8); // maximum bits storing source line number
|
2015-12-17 08:06:05 -05:00
|
|
|
size_t rule_id : 8; // this must be large enough to fit largest rule number
|
|
|
|
size_t arg_i; // this dictates the maximum nodes in a "list" of things
|
2013-10-04 14:53:11 -04:00
|
|
|
} rule_stack_t;
|
|
|
|
|
2015-09-23 05:50:43 -04:00
|
|
|
typedef struct _mp_parse_chunk_t {
|
2015-12-17 08:06:05 -05:00
|
|
|
size_t alloc;
|
2015-09-23 05:50:43 -04:00
|
|
|
union {
|
2015-12-17 08:06:05 -05:00
|
|
|
size_t used;
|
2015-09-23 05:50:43 -04:00
|
|
|
struct _mp_parse_chunk_t *next;
|
|
|
|
} union_;
|
|
|
|
byte data[];
|
|
|
|
} mp_parse_chunk_t;
|
|
|
|
|
2013-10-04 14:53:11 -04:00
|
|
|
typedef struct _parser_t {
|
2015-12-17 08:06:05 -05:00
|
|
|
size_t rule_stack_alloc;
|
|
|
|
size_t rule_stack_top;
|
2013-10-04 14:53:11 -04:00
|
|
|
rule_stack_t *rule_stack;
|
|
|
|
|
2015-12-17 08:06:05 -05:00
|
|
|
size_t result_stack_alloc;
|
|
|
|
size_t result_stack_top;
|
2013-12-21 13:17:45 -05:00
|
|
|
mp_parse_node_t *result_stack;
|
2014-01-18 18:24:36 -05:00
|
|
|
|
|
|
|
mp_lexer_t *lexer;
|
2015-09-23 05:50:43 -04:00
|
|
|
|
|
|
|
mp_parse_tree_t tree;
|
|
|
|
mp_parse_chunk_t *cur_chunk;
|
2013-10-04 14:53:11 -04:00
|
|
|
|
2015-10-08 09:58:15 -04:00
|
|
|
#if MICROPY_COMP_CONST
|
|
|
|
mp_map_t consts;
|
|
|
|
#endif
|
|
|
|
} parser_t;
|
2014-04-10 10:27:31 -04:00
|
|
|
|
2023-05-02 23:12:54 -04:00
|
|
|
STATIC void push_result_rule(parser_t *parser, size_t src_line, uint8_t rule_id, size_t num_args);
|
|
|
|
|
2017-12-25 21:39:02 -05:00
|
|
|
STATIC const uint16_t *get_rule_arg(uint8_t r_id) {
|
|
|
|
size_t off = rule_arg_offset_table[r_id];
|
|
|
|
if (r_id >= FIRST_RULE_WITH_OFFSET_ABOVE_255) {
|
|
|
|
off |= 0x100;
|
|
|
|
}
|
|
|
|
return &rule_arg_combined_table[off];
|
|
|
|
}
|
|
|
|
|
2015-09-23 05:50:43 -04:00
|
|
|
STATIC void *parser_alloc(parser_t *parser, size_t num_bytes) {
|
|
|
|
// use a custom memory allocator to store parse nodes sequentially in large chunks
|
|
|
|
|
|
|
|
mp_parse_chunk_t *chunk = parser->cur_chunk;
|
|
|
|
|
|
|
|
if (chunk != NULL && chunk->union_.used + num_bytes > chunk->alloc) {
|
|
|
|
// not enough room at end of previously allocated chunk so try to grow
|
2020-02-26 23:36:53 -05:00
|
|
|
mp_parse_chunk_t *new_data = (mp_parse_chunk_t *)m_renew_maybe(byte, chunk,
|
2015-09-23 05:50:43 -04:00
|
|
|
sizeof(mp_parse_chunk_t) + chunk->alloc,
|
|
|
|
sizeof(mp_parse_chunk_t) + chunk->alloc + num_bytes, false);
|
|
|
|
if (new_data == NULL) {
|
|
|
|
// could not grow existing memory; shrink it to fit previous
|
2016-02-23 08:44:29 -05:00
|
|
|
(void)m_renew_maybe(byte, chunk, sizeof(mp_parse_chunk_t) + chunk->alloc,
|
|
|
|
sizeof(mp_parse_chunk_t) + chunk->union_.used, false);
|
2015-09-23 05:50:43 -04:00
|
|
|
chunk->alloc = chunk->union_.used;
|
|
|
|
chunk->union_.next = parser->tree.chunk;
|
|
|
|
parser->tree.chunk = chunk;
|
|
|
|
chunk = NULL;
|
|
|
|
} else {
|
|
|
|
// could grow existing memory
|
|
|
|
chunk->alloc += num_bytes;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (chunk == NULL) {
|
|
|
|
// no previous chunk, allocate a new chunk
|
|
|
|
size_t alloc = MICROPY_ALLOC_PARSE_CHUNK_INIT;
|
|
|
|
if (alloc < num_bytes) {
|
|
|
|
alloc = num_bytes;
|
|
|
|
}
|
2020-02-26 23:36:53 -05:00
|
|
|
chunk = (mp_parse_chunk_t *)m_new(byte, sizeof(mp_parse_chunk_t) + alloc);
|
2015-09-23 05:50:43 -04:00
|
|
|
chunk->alloc = alloc;
|
|
|
|
chunk->union_.used = 0;
|
|
|
|
parser->cur_chunk = chunk;
|
|
|
|
}
|
|
|
|
|
|
|
|
byte *ret = chunk->data + chunk->union_.used;
|
|
|
|
chunk->union_.used += num_bytes;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2022-03-30 23:27:47 -04:00
|
|
|
#if MICROPY_COMP_CONST_TUPLE
|
|
|
|
STATIC void parser_free_parse_node_struct(parser_t *parser, mp_parse_node_struct_t *pns) {
|
|
|
|
mp_parse_chunk_t *chunk = parser->cur_chunk;
|
|
|
|
if (chunk->data <= (byte *)pns && (byte *)pns < chunk->data + chunk->union_.used) {
|
|
|
|
size_t num_bytes = sizeof(mp_parse_node_struct_t) + sizeof(mp_parse_node_t) * MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
|
|
|
|
chunk->union_.used -= num_bytes;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2017-12-23 07:36:08 -05:00
|
|
|
STATIC void push_rule(parser_t *parser, size_t src_line, uint8_t rule_id, size_t arg_i) {
|
2013-10-04 14:53:11 -04:00
|
|
|
if (parser->rule_stack_top >= parser->rule_stack_alloc) {
|
2017-02-23 22:56:37 -05:00
|
|
|
rule_stack_t *rs = m_renew(rule_stack_t, parser->rule_stack, parser->rule_stack_alloc, parser->rule_stack_alloc + MICROPY_ALLOC_PARSE_RULE_INC);
|
2014-04-10 10:27:31 -04:00
|
|
|
parser->rule_stack = rs;
|
2014-05-21 15:32:59 -04:00
|
|
|
parser->rule_stack_alloc += MICROPY_ALLOC_PARSE_RULE_INC;
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
2014-01-18 18:24:36 -05:00
|
|
|
rule_stack_t *rs = &parser->rule_stack[parser->rule_stack_top++];
|
|
|
|
rs->src_line = src_line;
|
2017-12-23 07:36:08 -05:00
|
|
|
rs->rule_id = rule_id;
|
2014-01-18 18:24:36 -05:00
|
|
|
rs->arg_i = arg_i;
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
|
2015-12-17 08:06:05 -05:00
|
|
|
STATIC void push_rule_from_arg(parser_t *parser, size_t arg) {
|
2013-10-04 14:53:11 -04:00
|
|
|
assert((arg & RULE_ARG_KIND_MASK) == RULE_ARG_RULE || (arg & RULE_ARG_KIND_MASK) == RULE_ARG_OPT_RULE);
|
2015-12-17 08:06:05 -05:00
|
|
|
size_t rule_id = arg & RULE_ARG_ARG_MASK;
|
2017-12-23 07:36:08 -05:00
|
|
|
push_rule(parser, parser->lexer->tok_line, rule_id, 0);
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
|
2017-12-23 08:01:02 -05:00
|
|
|
STATIC uint8_t pop_rule(parser_t *parser, size_t *arg_i, size_t *src_line) {
|
2013-10-04 14:53:11 -04:00
|
|
|
parser->rule_stack_top -= 1;
|
2017-12-23 08:01:02 -05:00
|
|
|
uint8_t rule_id = parser->rule_stack[parser->rule_stack_top].rule_id;
|
2013-10-04 14:53:11 -04:00
|
|
|
*arg_i = parser->rule_stack[parser->rule_stack_top].arg_i;
|
2014-01-18 18:24:36 -05:00
|
|
|
*src_line = parser->rule_stack[parser->rule_stack_top].src_line;
|
2017-12-23 08:01:02 -05:00
|
|
|
return rule_id;
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
|
2022-03-30 23:27:47 -04:00
|
|
|
#if MICROPY_COMP_CONST_TUPLE
|
|
|
|
STATIC uint8_t peek_rule(parser_t *parser, size_t n) {
|
|
|
|
assert(parser->rule_stack_top > n);
|
|
|
|
return parser->rule_stack[parser->rule_stack_top - 1 - n].rule_id;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-01-07 09:40:35 -05:00
|
|
|
bool mp_parse_node_get_int_maybe(mp_parse_node_t pn, mp_obj_t *o) {
|
|
|
|
if (MP_PARSE_NODE_IS_SMALL_INT(pn)) {
|
|
|
|
*o = MP_OBJ_NEW_SMALL_INT(MP_PARSE_NODE_LEAF_SMALL_INT(pn));
|
|
|
|
return true;
|
|
|
|
} else if (MP_PARSE_NODE_IS_STRUCT_KIND(pn, RULE_const_object)) {
|
2020-02-26 23:36:53 -05:00
|
|
|
mp_parse_node_struct_t *pns = (mp_parse_node_struct_t *)pn;
|
2022-03-30 23:26:07 -04:00
|
|
|
*o = mp_parse_node_extract_const_object(pns);
|
2019-01-30 02:49:52 -05:00
|
|
|
return mp_obj_is_int(*o);
|
2016-01-07 09:40:35 -05:00
|
|
|
} else {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
py/parse: Allow all constant objects to be used in "X = const(o)".
Now that constant tuples are supported in the parser, eg (1, True, "str"),
it's a small step to allow anything that is a constant to be used with the
pattern:
from micropython import const
X = const(obj)
This commit makes the required changes to allow the following types of
constants:
from micropython import const
_INT = const(123)
_FLOAT = const(1.2)
_COMPLEX = const(3.4j)
_STR = const("str")
_BYTES = const(b"bytes")
_TUPLE = const((_INT, _STR, _BYTES))
_TUPLE2 = const((None, False, True, ..., (), _TUPLE))
Prior to this, only integers could be used in const(...).
Signed-off-by: Damien George <damien@micropython.org>
2022-04-14 10:45:25 -04:00
|
|
|
#if MICROPY_COMP_CONST_TUPLE || MICROPY_COMP_CONST
|
2022-03-30 23:27:47 -04:00
|
|
|
STATIC bool mp_parse_node_is_const(mp_parse_node_t pn) {
|
|
|
|
if (MP_PARSE_NODE_IS_SMALL_INT(pn)) {
|
|
|
|
// Small integer.
|
|
|
|
return true;
|
|
|
|
} else if (MP_PARSE_NODE_IS_LEAF(pn)) {
|
|
|
|
// Possible str, or constant literal.
|
|
|
|
uintptr_t kind = MP_PARSE_NODE_LEAF_KIND(pn);
|
|
|
|
if (kind == MP_PARSE_NODE_STRING) {
|
|
|
|
return true;
|
|
|
|
} else if (kind == MP_PARSE_NODE_TOKEN) {
|
|
|
|
uintptr_t arg = MP_PARSE_NODE_LEAF_ARG(pn);
|
|
|
|
return arg == MP_TOKEN_KW_NONE
|
|
|
|
|| arg == MP_TOKEN_KW_FALSE
|
|
|
|
|| arg == MP_TOKEN_KW_TRUE
|
|
|
|
|| arg == MP_TOKEN_ELLIPSIS;
|
|
|
|
}
|
|
|
|
} else if (MP_PARSE_NODE_IS_STRUCT_KIND(pn, RULE_const_object)) {
|
|
|
|
// Constant object.
|
|
|
|
return true;
|
|
|
|
} else if (MP_PARSE_NODE_IS_STRUCT_KIND(pn, RULE_atom_paren)) {
|
|
|
|
// Possible empty tuple.
|
|
|
|
mp_parse_node_struct_t *pns = (mp_parse_node_struct_t *)pn;
|
|
|
|
return MP_PARSE_NODE_IS_NULL(pns->nodes[0]);
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
STATIC mp_obj_t mp_parse_node_convert_to_obj(mp_parse_node_t pn) {
|
|
|
|
assert(mp_parse_node_is_const(pn));
|
|
|
|
if (MP_PARSE_NODE_IS_SMALL_INT(pn)) {
|
|
|
|
mp_int_t arg = MP_PARSE_NODE_LEAF_SMALL_INT(pn);
|
|
|
|
#if MICROPY_DYNAMIC_COMPILER
|
|
|
|
mp_uint_t sign_mask = -((mp_uint_t)1 << (mp_dynamic_compiler.small_int_bits - 1));
|
|
|
|
if (!((arg & sign_mask) == 0 || (arg & sign_mask) == sign_mask)) {
|
|
|
|
// Integer doesn't fit in a small-int, so create a multi-precision int object.
|
|
|
|
return mp_obj_new_int_from_ll(arg);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
return MP_OBJ_NEW_SMALL_INT(arg);
|
|
|
|
} else if (MP_PARSE_NODE_IS_LEAF(pn)) {
|
|
|
|
uintptr_t kind = MP_PARSE_NODE_LEAF_KIND(pn);
|
|
|
|
uintptr_t arg = MP_PARSE_NODE_LEAF_ARG(pn);
|
|
|
|
if (kind == MP_PARSE_NODE_STRING) {
|
|
|
|
return MP_OBJ_NEW_QSTR(arg);
|
|
|
|
} else {
|
|
|
|
assert(MP_PARSE_NODE_LEAF_KIND(pn) == MP_PARSE_NODE_TOKEN);
|
|
|
|
switch (arg) {
|
|
|
|
case MP_TOKEN_KW_NONE:
|
|
|
|
return mp_const_none;
|
|
|
|
case MP_TOKEN_KW_FALSE:
|
|
|
|
return mp_const_false;
|
|
|
|
case MP_TOKEN_KW_TRUE:
|
|
|
|
return mp_const_true;
|
|
|
|
default:
|
|
|
|
assert(arg == MP_TOKEN_ELLIPSIS);
|
|
|
|
return MP_OBJ_FROM_PTR(&mp_const_ellipsis_obj);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (MP_PARSE_NODE_IS_STRUCT_KIND(pn, RULE_const_object)) {
|
|
|
|
mp_parse_node_struct_t *pns = (mp_parse_node_struct_t *)pn;
|
|
|
|
return mp_parse_node_extract_const_object(pns);
|
|
|
|
} else {
|
|
|
|
assert(MP_PARSE_NODE_IS_STRUCT_KIND(pn, RULE_atom_paren));
|
|
|
|
assert(MP_PARSE_NODE_IS_NULL(((mp_parse_node_struct_t *)pn)->nodes[0]));
|
|
|
|
return mp_const_empty_tuple;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2022-07-26 22:52:48 -04:00
|
|
|
STATIC bool parse_node_is_const_bool(mp_parse_node_t pn, bool value) {
|
|
|
|
// Returns true if 'pn' is a constant whose boolean value is equivalent to 'value'
|
|
|
|
#if MICROPY_COMP_CONST_TUPLE || MICROPY_COMP_CONST
|
|
|
|
return mp_parse_node_is_const(pn) && mp_obj_is_true(mp_parse_node_convert_to_obj(pn)) == value;
|
|
|
|
#else
|
|
|
|
return MP_PARSE_NODE_IS_TOKEN_KIND(pn, value ? MP_TOKEN_KW_TRUE : MP_TOKEN_KW_FALSE)
|
|
|
|
|| (MP_PARSE_NODE_IS_SMALL_INT(pn) && !!MP_PARSE_NODE_LEAF_SMALL_INT(pn) == value);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
bool mp_parse_node_is_const_false(mp_parse_node_t pn) {
|
|
|
|
return parse_node_is_const_bool(pn, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool mp_parse_node_is_const_true(mp_parse_node_t pn) {
|
|
|
|
return parse_node_is_const_bool(pn, true);
|
|
|
|
}
|
|
|
|
|
2020-05-04 08:11:44 -04:00
|
|
|
size_t mp_parse_node_extract_list(mp_parse_node_t *pn, size_t pn_kind, mp_parse_node_t **nodes) {
|
2015-02-12 21:29:46 -05:00
|
|
|
if (MP_PARSE_NODE_IS_NULL(*pn)) {
|
|
|
|
*nodes = NULL;
|
|
|
|
return 0;
|
|
|
|
} else if (MP_PARSE_NODE_IS_LEAF(*pn)) {
|
|
|
|
*nodes = pn;
|
|
|
|
return 1;
|
|
|
|
} else {
|
2020-02-26 23:36:53 -05:00
|
|
|
mp_parse_node_struct_t *pns = (mp_parse_node_struct_t *)(*pn);
|
2015-02-12 21:29:46 -05:00
|
|
|
if (MP_PARSE_NODE_STRUCT_KIND(pns) != pn_kind) {
|
|
|
|
*nodes = pn;
|
|
|
|
return 1;
|
|
|
|
} else {
|
|
|
|
*nodes = pns->nodes;
|
|
|
|
return MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-19 06:48:48 -05:00
|
|
|
#if MICROPY_DEBUG_PRINTERS
|
2020-09-11 09:00:03 -04:00
|
|
|
void mp_parse_node_print(const mp_print_t *print, mp_parse_node_t pn, size_t indent) {
|
2014-01-18 18:24:36 -05:00
|
|
|
if (MP_PARSE_NODE_IS_STRUCT(pn)) {
|
2020-09-11 09:00:03 -04:00
|
|
|
mp_printf(print, "[% 4d] ", (int)((mp_parse_node_struct_t *)pn)->source_line);
|
2014-01-18 18:24:36 -05:00
|
|
|
} else {
|
2020-09-11 09:00:03 -04:00
|
|
|
mp_printf(print, " ");
|
2014-01-18 18:24:36 -05:00
|
|
|
}
|
2015-12-17 08:06:05 -05:00
|
|
|
for (size_t i = 0; i < indent; i++) {
|
2020-09-11 09:00:03 -04:00
|
|
|
mp_printf(print, " ");
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
2013-12-21 13:17:45 -05:00
|
|
|
if (MP_PARSE_NODE_IS_NULL(pn)) {
|
2020-09-11 09:00:03 -04:00
|
|
|
mp_printf(print, "NULL\n");
|
2014-02-22 09:39:45 -05:00
|
|
|
} else if (MP_PARSE_NODE_IS_SMALL_INT(pn)) {
|
2014-07-03 08:25:24 -04:00
|
|
|
mp_int_t arg = MP_PARSE_NODE_LEAF_SMALL_INT(pn);
|
2020-09-11 09:00:03 -04:00
|
|
|
mp_printf(print, "int(" INT_FMT ")\n", arg);
|
2013-12-21 13:17:45 -05:00
|
|
|
} else if (MP_PARSE_NODE_IS_LEAF(pn)) {
|
2015-12-17 08:06:05 -05:00
|
|
|
uintptr_t arg = MP_PARSE_NODE_LEAF_ARG(pn);
|
2013-12-21 13:17:45 -05:00
|
|
|
switch (MP_PARSE_NODE_LEAF_KIND(pn)) {
|
2020-02-26 23:36:53 -05:00
|
|
|
case MP_PARSE_NODE_ID:
|
2020-09-11 09:00:03 -04:00
|
|
|
mp_printf(print, "id(%s)\n", qstr_str(arg));
|
2020-02-26 23:36:53 -05:00
|
|
|
break;
|
|
|
|
case MP_PARSE_NODE_STRING:
|
2020-09-11 09:00:03 -04:00
|
|
|
mp_printf(print, "str(%s)\n", qstr_str(arg));
|
2020-02-26 23:36:53 -05:00
|
|
|
break;
|
2017-01-17 01:00:55 -05:00
|
|
|
default:
|
|
|
|
assert(MP_PARSE_NODE_LEAF_KIND(pn) == MP_PARSE_NODE_TOKEN);
|
2020-09-11 09:00:03 -04:00
|
|
|
mp_printf(print, "tok(%u)\n", (uint)arg);
|
2020-02-26 23:36:53 -05:00
|
|
|
break;
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
} else {
|
2014-05-25 17:06:06 -04:00
|
|
|
// node must be a mp_parse_node_struct_t
|
2020-02-26 23:36:53 -05:00
|
|
|
mp_parse_node_struct_t *pns = (mp_parse_node_struct_t *)pn;
|
2017-02-23 21:43:43 -05:00
|
|
|
if (MP_PARSE_NODE_STRUCT_KIND(pns) == RULE_const_object) {
|
2022-03-30 23:26:07 -04:00
|
|
|
mp_obj_t obj = mp_parse_node_extract_const_object(pns);
|
2015-11-27 12:09:11 -05:00
|
|
|
#if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
|
2022-03-30 23:26:36 -04:00
|
|
|
mp_printf(print, "literal const(%016llx)=", obj);
|
2015-11-27 12:09:11 -05:00
|
|
|
#else
|
2022-03-30 23:26:36 -04:00
|
|
|
mp_printf(print, "literal const(%p)=", obj);
|
2015-11-27 12:09:11 -05:00
|
|
|
#endif
|
2022-03-30 23:26:36 -04:00
|
|
|
mp_obj_print_helper(print, obj, PRINT_REPR);
|
|
|
|
mp_printf(print, "\n");
|
2014-05-25 17:06:06 -04:00
|
|
|
} else {
|
2015-12-17 08:06:05 -05:00
|
|
|
size_t n = MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
|
2020-09-30 09:34:42 -04:00
|
|
|
#if MICROPY_DEBUG_PARSE_RULE_NAME
|
2020-09-11 09:00:03 -04:00
|
|
|
mp_printf(print, "%s(%u) (n=%u)\n", rule_name_table[MP_PARSE_NODE_STRUCT_KIND(pns)], (uint)MP_PARSE_NODE_STRUCT_KIND(pns), (uint)n);
|
2017-12-23 07:04:02 -05:00
|
|
|
#else
|
2020-09-11 09:00:03 -04:00
|
|
|
mp_printf(print, "rule(%u) (n=%u)\n", (uint)MP_PARSE_NODE_STRUCT_KIND(pns), (uint)n);
|
2017-12-23 07:04:02 -05:00
|
|
|
#endif
|
2015-12-17 08:06:05 -05:00
|
|
|
for (size_t i = 0; i < n; i++) {
|
2020-09-11 09:00:03 -04:00
|
|
|
mp_parse_node_print(print, pns->nodes[i], indent + 2);
|
2014-05-25 17:06:06 -04:00
|
|
|
}
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-01-19 06:48:48 -05:00
|
|
|
#endif // MICROPY_DEBUG_PRINTERS
|
2013-10-04 14:53:11 -04:00
|
|
|
|
|
|
|
/*
|
2020-09-11 09:00:03 -04:00
|
|
|
STATIC void result_stack_show(const mp_print_t *print, parser_t *parser) {
|
|
|
|
mp_printf(print, "result stack, most recent first\n");
|
2015-12-17 08:06:05 -05:00
|
|
|
for (ssize_t i = parser->result_stack_top - 1; i >= 0; i--) {
|
2020-09-11 09:00:03 -04:00
|
|
|
mp_parse_node_print(print, parser->result_stack[i], 0);
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
*/
|
|
|
|
|
2014-02-12 11:31:30 -05:00
|
|
|
STATIC mp_parse_node_t pop_result(parser_t *parser) {
|
2013-10-04 14:53:11 -04:00
|
|
|
assert(parser->result_stack_top > 0);
|
|
|
|
return parser->result_stack[--parser->result_stack_top];
|
|
|
|
}
|
|
|
|
|
2015-12-17 08:06:05 -05:00
|
|
|
STATIC mp_parse_node_t peek_result(parser_t *parser, size_t pos) {
|
2013-10-04 14:53:11 -04:00
|
|
|
assert(parser->result_stack_top > pos);
|
|
|
|
return parser->result_stack[parser->result_stack_top - 1 - pos];
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:31:30 -05:00
|
|
|
STATIC void push_result_node(parser_t *parser, mp_parse_node_t pn) {
|
2014-01-12 08:55:24 -05:00
|
|
|
if (parser->result_stack_top >= parser->result_stack_alloc) {
|
2017-02-23 22:56:37 -05:00
|
|
|
mp_parse_node_t *stack = m_renew(mp_parse_node_t, parser->result_stack, parser->result_stack_alloc, parser->result_stack_alloc + MICROPY_ALLOC_PARSE_RESULT_INC);
|
2015-01-20 06:55:10 -05:00
|
|
|
parser->result_stack = stack;
|
2014-05-21 15:32:59 -04:00
|
|
|
parser->result_stack_alloc += MICROPY_ALLOC_PARSE_RESULT_INC;
|
2014-01-12 08:55:24 -05:00
|
|
|
}
|
2013-10-04 14:53:11 -04:00
|
|
|
parser->result_stack[parser->result_stack_top++] = pn;
|
|
|
|
}
|
|
|
|
|
2015-12-17 08:06:05 -05:00
|
|
|
STATIC mp_parse_node_t make_node_const_object(parser_t *parser, size_t src_line, mp_obj_t obj) {
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_parse_node_struct_t *pn = parser_alloc(parser, sizeof(mp_parse_node_struct_t) + sizeof(mp_obj_t));
|
2015-02-07 20:57:40 -05:00
|
|
|
pn->source_line = src_line;
|
2015-11-27 12:09:11 -05:00
|
|
|
#if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
|
|
|
|
// nodes are 32-bit pointers, but need to store 64-bit object
|
|
|
|
pn->kind_num_nodes = RULE_const_object | (2 << 8);
|
|
|
|
pn->nodes[0] = (uint64_t)obj;
|
|
|
|
pn->nodes[1] = (uint64_t)obj >> 32;
|
|
|
|
#else
|
2015-02-07 20:57:40 -05:00
|
|
|
pn->kind_num_nodes = RULE_const_object | (1 << 8);
|
2015-12-17 08:06:05 -05:00
|
|
|
pn->nodes[0] = (uintptr_t)obj;
|
2015-11-27 12:09:11 -05:00
|
|
|
#endif
|
2015-02-07 20:57:40 -05:00
|
|
|
return (mp_parse_node_t)pn;
|
2014-05-25 17:06:06 -04:00
|
|
|
}
|
2014-05-08 15:43:46 -04:00
|
|
|
|
2023-03-07 22:10:02 -05:00
|
|
|
// Create a parse node representing a constant object, possibly optimising the case of
|
py/parse: Allow all constant objects to be used in "X = const(o)".
Now that constant tuples are supported in the parser, eg (1, True, "str"),
it's a small step to allow anything that is a constant to be used with the
pattern:
from micropython import const
X = const(obj)
This commit makes the required changes to allow the following types of
constants:
from micropython import const
_INT = const(123)
_FLOAT = const(1.2)
_COMPLEX = const(3.4j)
_STR = const("str")
_BYTES = const(b"bytes")
_TUPLE = const((_INT, _STR, _BYTES))
_TUPLE2 = const((None, False, True, ..., (), _TUPLE))
Prior to this, only integers could be used in const(...).
Signed-off-by: Damien George <damien@micropython.org>
2022-04-14 10:45:25 -04:00
|
|
|
// an integer, by putting the (small) integer value directly in the parse node itself.
|
|
|
|
STATIC mp_parse_node_t make_node_const_object_optimised(parser_t *parser, size_t src_line, mp_obj_t obj) {
|
2022-03-15 09:00:25 -04:00
|
|
|
if (mp_obj_is_small_int(obj)) {
|
|
|
|
mp_int_t val = MP_OBJ_SMALL_INT_VALUE(obj);
|
|
|
|
#if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
|
|
|
|
// A parse node is only 32-bits and the small-int value must fit in 31-bits
|
|
|
|
if (((val ^ (val << 1)) & 0xffffffff80000000) != 0) {
|
|
|
|
return make_node_const_object(parser, src_line, obj);
|
|
|
|
}
|
|
|
|
#endif
|
2022-03-15 09:33:44 -04:00
|
|
|
#if MICROPY_DYNAMIC_COMPILER
|
|
|
|
// Check that the integer value fits in target runtime's small-int
|
|
|
|
mp_uint_t sign_mask = -((mp_uint_t)1 << (mp_dynamic_compiler.small_int_bits - 1));
|
|
|
|
if (!((val & sign_mask) == 0 || (val & sign_mask) == sign_mask)) {
|
|
|
|
return make_node_const_object(parser, src_line, obj);
|
|
|
|
}
|
|
|
|
#endif
|
2022-03-15 09:00:25 -04:00
|
|
|
return mp_parse_node_new_small_int(val);
|
|
|
|
} else {
|
|
|
|
return make_node_const_object(parser, src_line, obj);
|
2017-12-11 06:39:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-12-23 07:53:01 -05:00
|
|
|
STATIC void push_result_token(parser_t *parser, uint8_t rule_id) {
|
2013-12-21 13:17:45 -05:00
|
|
|
mp_parse_node_t pn;
|
2014-12-05 14:35:18 -05:00
|
|
|
mp_lexer_t *lex = parser->lexer;
|
|
|
|
if (lex->tok_kind == MP_TOKEN_NAME) {
|
2015-10-08 09:58:15 -04:00
|
|
|
qstr id = qstr_from_strn(lex->vstr.buf, lex->vstr.len);
|
|
|
|
#if MICROPY_COMP_CONST
|
2016-09-23 03:23:16 -04:00
|
|
|
// if name is a standalone identifier, look it up in the table of dynamic constants
|
|
|
|
mp_map_elem_t *elem;
|
2017-12-23 07:53:01 -05:00
|
|
|
if (rule_id == RULE_atom
|
2016-09-23 03:23:16 -04:00
|
|
|
&& (elem = mp_map_lookup(&parser->consts, MP_OBJ_NEW_QSTR(id), MP_MAP_LOOKUP)) != NULL) {
|
py/parse: Allow all constant objects to be used in "X = const(o)".
Now that constant tuples are supported in the parser, eg (1, True, "str"),
it's a small step to allow anything that is a constant to be used with the
pattern:
from micropython import const
X = const(obj)
This commit makes the required changes to allow the following types of
constants:
from micropython import const
_INT = const(123)
_FLOAT = const(1.2)
_COMPLEX = const(3.4j)
_STR = const("str")
_BYTES = const(b"bytes")
_TUPLE = const((_INT, _STR, _BYTES))
_TUPLE2 = const((None, False, True, ..., (), _TUPLE))
Prior to this, only integers could be used in const(...).
Signed-off-by: Damien George <damien@micropython.org>
2022-04-14 10:45:25 -04:00
|
|
|
pn = make_node_const_object_optimised(parser, lex->tok_line, elem->value);
|
2016-09-23 03:23:16 -04:00
|
|
|
} else {
|
2015-10-08 09:58:15 -04:00
|
|
|
pn = mp_parse_node_new_leaf(MP_PARSE_NODE_ID, id);
|
|
|
|
}
|
2016-09-23 03:23:16 -04:00
|
|
|
#else
|
2017-12-23 07:53:01 -05:00
|
|
|
(void)rule_id;
|
2016-09-23 03:23:16 -04:00
|
|
|
pn = mp_parse_node_new_leaf(MP_PARSE_NODE_ID, id);
|
|
|
|
#endif
|
2015-02-07 20:57:40 -05:00
|
|
|
} else if (lex->tok_kind == MP_TOKEN_INTEGER) {
|
|
|
|
mp_obj_t o = mp_parse_num_integer(lex->vstr.buf, lex->vstr.len, 0, lex);
|
py/parse: Allow all constant objects to be used in "X = const(o)".
Now that constant tuples are supported in the parser, eg (1, True, "str"),
it's a small step to allow anything that is a constant to be used with the
pattern:
from micropython import const
X = const(obj)
This commit makes the required changes to allow the following types of
constants:
from micropython import const
_INT = const(123)
_FLOAT = const(1.2)
_COMPLEX = const(3.4j)
_STR = const("str")
_BYTES = const(b"bytes")
_TUPLE = const((_INT, _STR, _BYTES))
_TUPLE2 = const((None, False, True, ..., (), _TUPLE))
Prior to this, only integers could be used in const(...).
Signed-off-by: Damien George <damien@micropython.org>
2022-04-14 10:45:25 -04:00
|
|
|
pn = make_node_const_object_optimised(parser, lex->tok_line, o);
|
2015-02-07 20:57:40 -05:00
|
|
|
} else if (lex->tok_kind == MP_TOKEN_FLOAT_OR_IMAG) {
|
2022-06-21 20:37:48 -04:00
|
|
|
mp_obj_t o = mp_parse_num_float(lex->vstr.buf, lex->vstr.len, true, lex);
|
2015-02-07 20:57:40 -05:00
|
|
|
pn = make_node_const_object(parser, lex->tok_line, o);
|
2022-03-15 09:22:58 -04:00
|
|
|
} else if (lex->tok_kind == MP_TOKEN_STRING) {
|
|
|
|
// Don't automatically intern all strings. Doc strings (which are usually large)
|
2014-05-25 17:06:06 -04:00
|
|
|
// will be discarded by the compiler, and so we shouldn't intern them.
|
2019-09-25 01:53:30 -04:00
|
|
|
qstr qst = MP_QSTRnull;
|
2014-12-05 14:35:18 -05:00
|
|
|
if (lex->vstr.len <= MICROPY_ALLOC_PARSE_INTERN_STRING_LEN) {
|
2014-05-25 17:06:06 -04:00
|
|
|
// intern short strings
|
2014-12-05 14:35:18 -05:00
|
|
|
qst = qstr_from_strn(lex->vstr.buf, lex->vstr.len);
|
2014-05-25 17:06:06 -04:00
|
|
|
} else {
|
|
|
|
// check if this string is already interned
|
2014-12-05 14:35:18 -05:00
|
|
|
qst = qstr_find_strn(lex->vstr.buf, lex->vstr.len);
|
2014-05-25 17:06:06 -04:00
|
|
|
}
|
2019-09-25 01:53:30 -04:00
|
|
|
if (qst != MP_QSTRnull) {
|
2014-05-25 17:06:06 -04:00
|
|
|
// qstr exists, make a leaf node
|
2022-03-15 09:22:58 -04:00
|
|
|
pn = mp_parse_node_new_leaf(MP_PARSE_NODE_STRING, qst);
|
2014-05-25 17:06:06 -04:00
|
|
|
} else {
|
2022-03-15 09:22:58 -04:00
|
|
|
// not interned, make a node holding a pointer to the string object
|
|
|
|
mp_obj_t o = mp_obj_new_str_copy(&mp_type_str, (const byte *)lex->vstr.buf, lex->vstr.len);
|
2017-02-23 21:43:43 -05:00
|
|
|
pn = make_node_const_object(parser, lex->tok_line, o);
|
2014-05-25 17:06:06 -04:00
|
|
|
}
|
2022-03-15 09:22:58 -04:00
|
|
|
} else if (lex->tok_kind == MP_TOKEN_BYTES) {
|
|
|
|
// make a node holding a pointer to the bytes object
|
|
|
|
mp_obj_t o = mp_obj_new_bytes((const byte *)lex->vstr.buf, lex->vstr.len);
|
|
|
|
pn = make_node_const_object(parser, lex->tok_line, o);
|
2013-10-04 14:53:11 -04:00
|
|
|
} else {
|
2014-12-05 14:35:18 -05:00
|
|
|
pn = mp_parse_node_new_leaf(MP_PARSE_NODE_TOKEN, lex->tok_kind);
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
push_result_node(parser, pn);
|
|
|
|
}
|
|
|
|
|
2023-05-02 23:12:54 -04:00
|
|
|
#if MICROPY_COMP_CONST_FOLDING
|
|
|
|
|
2015-10-08 09:58:15 -04:00
|
|
|
#if MICROPY_COMP_MODULE_CONST
|
2015-11-27 08:38:15 -05:00
|
|
|
STATIC const mp_rom_map_elem_t mp_constants_table[] = {
|
2016-05-10 18:23:50 -04:00
|
|
|
#if MICROPY_PY_UERRNO
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_module_uerrno) },
|
|
|
|
#endif
|
2015-10-08 09:58:15 -04:00
|
|
|
#if MICROPY_PY_UCTYPES
|
2015-11-27 08:38:15 -05:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_uctypes), MP_ROM_PTR(&mp_module_uctypes) },
|
2015-10-08 09:58:15 -04:00
|
|
|
#endif
|
|
|
|
// Extra constants as defined by a port
|
|
|
|
MICROPY_PORT_CONSTANTS
|
|
|
|
};
|
|
|
|
STATIC MP_DEFINE_CONST_MAP(mp_constants_map, mp_constants_table);
|
|
|
|
#endif
|
|
|
|
|
py/parse: Work around xtensa esp-2020r3 compiler bug.
This commit works around a bug in xtensa-esp32-elf-gcc version esp-2020r3.
The bug is in generation of loop constructs. The below code is generated
by the xtensa-esp32 compiler. The first extract is the buggy machine code
and the second extract is the corrected machine code. The test
`basics/logic_constfolding.py` fails with the first code and succeeds with
the second.
Disassembly of section .text.push_result_rule:
00000000 <push_result_rule>:
...
d6: 209770 or a9, a7, a7
d9: 178976 loop a9, f4 <push_result_rule+0xf4>
d9: R_XTENSA_SLOT0_OP .text.push_result_rule+0xf4
dc: 030190 rsr.lend a9
df: 130090 wsr.lbeg a9
e2: a8c992 addi a9, a9, -88
e5: 06d992 addmi a9, a9, 0x600
e8: 130190 wsr.lend a9
eb: 002000 isync
ee: 030290 rsr.lcount a9
f1: 01c992 addi a9, a9, 1
f4: 1494e7 bne a4, a14, 10c <push_result_rule+0x10c>
f4: R_XTENSA_SLOT0_OP .text.push_result_rule+0x10c
Disassembly of section .text.push_result_rule:
00000000 <push_result_rule>:
...
d6: 209770 or a9, a7, a7
d9: 178976 loop a9, f4 <push_result_rule+0xf4>
d9: R_XTENSA_SLOT0_OP .text.push_result_rule+0xf4
dc: 030190 rsr.lend a9
df: 130090 wsr.lbeg a9
e2: 000091 l32r a9, fffc00e4 <push_result_rule+0xfffc00e4>
e2: R_XTENSA_SLOT0_OP .literal.push_result_rule+0x18
e5: 0020f0 nop
e8: 130190 wsr.lend a9
eb: 002000 isync
ee: 030290 rsr.lcount a9
f1: 01c992 addi a9, a9, 1
f4: 1494e7 bne a4, a14, 10c <push_result_rule+0x10c>
f4: R_XTENSA_SLOT0_OP .text.push_result_rule+0x10c
Work done in collaboration with @jimmo.
Signed-off-by: Damien George <damien@micropython.org>
2022-06-08 22:36:45 -04:00
|
|
|
#if MICROPY_COMP_CONST_FOLDING_COMPILER_WORKAROUND
|
|
|
|
// Some versions of the xtensa-esp32-elf-gcc compiler generate wrong code if this
|
|
|
|
// function is static, so provide a hook for them to work around this problem.
|
|
|
|
MP_NOINLINE
|
|
|
|
#endif
|
2017-12-23 07:49:48 -05:00
|
|
|
STATIC bool fold_logical_constants(parser_t *parser, uint8_t rule_id, size_t *num_args) {
|
|
|
|
if (rule_id == RULE_or_test
|
|
|
|
|| rule_id == RULE_and_test) {
|
2016-11-12 23:36:49 -05:00
|
|
|
// folding for binary logical ops: or and
|
|
|
|
size_t copy_to = *num_args;
|
|
|
|
for (size_t i = copy_to; i > 0;) {
|
|
|
|
mp_parse_node_t pn = peek_result(parser, --i);
|
|
|
|
parser->result_stack[parser->result_stack_top - copy_to] = pn;
|
|
|
|
if (i == 0) {
|
|
|
|
// always need to keep the last value
|
|
|
|
break;
|
|
|
|
}
|
2017-12-23 07:49:48 -05:00
|
|
|
if (rule_id == RULE_or_test) {
|
2016-11-12 23:36:49 -05:00
|
|
|
if (mp_parse_node_is_const_true(pn)) {
|
|
|
|
//
|
|
|
|
break;
|
|
|
|
} else if (!mp_parse_node_is_const_false(pn)) {
|
|
|
|
copy_to -= 1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// RULE_and_test
|
|
|
|
if (mp_parse_node_is_const_false(pn)) {
|
|
|
|
break;
|
|
|
|
} else if (!mp_parse_node_is_const_true(pn)) {
|
|
|
|
copy_to -= 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
copy_to -= 1; // copy_to now contains number of args to pop
|
|
|
|
|
|
|
|
// pop and discard all the short-circuited expressions
|
|
|
|
for (size_t i = 0; i < copy_to; ++i) {
|
|
|
|
pop_result(parser);
|
|
|
|
}
|
|
|
|
*num_args -= copy_to;
|
|
|
|
|
|
|
|
// we did a complete folding if there's only 1 arg left
|
|
|
|
return *num_args == 1;
|
|
|
|
|
2017-12-23 07:49:48 -05:00
|
|
|
} else if (rule_id == RULE_not_test_2) {
|
2016-11-12 23:36:49 -05:00
|
|
|
// folding for unary logical op: not
|
|
|
|
mp_parse_node_t pn = peek_result(parser, 0);
|
|
|
|
if (mp_parse_node_is_const_false(pn)) {
|
|
|
|
pn = mp_parse_node_new_leaf(MP_PARSE_NODE_TOKEN, MP_TOKEN_KW_TRUE);
|
|
|
|
} else if (mp_parse_node_is_const_true(pn)) {
|
|
|
|
pn = mp_parse_node_new_leaf(MP_PARSE_NODE_TOKEN, MP_TOKEN_KW_FALSE);
|
|
|
|
} else {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
pop_result(parser);
|
|
|
|
push_result_node(parser, pn);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2017-12-23 07:49:48 -05:00
|
|
|
STATIC bool fold_constants(parser_t *parser, uint8_t rule_id, size_t num_args) {
|
2015-10-08 09:58:15 -04:00
|
|
|
// this code does folding of arbitrary integer expressions, eg 1 + 2 * 3 + 4
|
|
|
|
// it does not do partial folding, eg 1 + 2 + x -> 3 + x
|
|
|
|
|
2016-01-07 09:40:35 -05:00
|
|
|
mp_obj_t arg0;
|
2017-12-23 07:49:48 -05:00
|
|
|
if (rule_id == RULE_expr
|
|
|
|
|| rule_id == RULE_xor_expr
|
2020-04-06 22:23:08 -04:00
|
|
|
|| rule_id == RULE_and_expr
|
|
|
|
|| rule_id == RULE_power) {
|
|
|
|
// folding for binary ops: | ^ & **
|
2015-10-08 09:58:15 -04:00
|
|
|
mp_parse_node_t pn = peek_result(parser, num_args - 1);
|
2016-01-07 09:40:35 -05:00
|
|
|
if (!mp_parse_node_get_int_maybe(pn, &arg0)) {
|
2015-10-08 09:58:15 -04:00
|
|
|
return false;
|
|
|
|
}
|
2016-01-07 09:40:35 -05:00
|
|
|
mp_binary_op_t op;
|
2017-12-23 07:49:48 -05:00
|
|
|
if (rule_id == RULE_expr) {
|
2016-01-07 09:40:35 -05:00
|
|
|
op = MP_BINARY_OP_OR;
|
2017-12-23 07:49:48 -05:00
|
|
|
} else if (rule_id == RULE_xor_expr) {
|
2016-01-07 09:40:35 -05:00
|
|
|
op = MP_BINARY_OP_XOR;
|
2020-04-06 22:23:08 -04:00
|
|
|
} else if (rule_id == RULE_and_expr) {
|
2016-01-07 09:40:35 -05:00
|
|
|
op = MP_BINARY_OP_AND;
|
2020-04-06 22:23:08 -04:00
|
|
|
} else {
|
|
|
|
op = MP_BINARY_OP_POWER;
|
2016-01-07 09:40:35 -05:00
|
|
|
}
|
2015-12-17 08:06:05 -05:00
|
|
|
for (ssize_t i = num_args - 2; i >= 0; --i) {
|
2015-10-08 09:58:15 -04:00
|
|
|
pn = peek_result(parser, i);
|
2016-01-07 09:40:35 -05:00
|
|
|
mp_obj_t arg1;
|
|
|
|
if (!mp_parse_node_get_int_maybe(pn, &arg1)) {
|
2015-10-08 09:58:15 -04:00
|
|
|
return false;
|
|
|
|
}
|
2020-04-06 22:23:08 -04:00
|
|
|
if (op == MP_BINARY_OP_POWER && mp_obj_int_sign(arg1) < 0) {
|
|
|
|
// ** can't have negative rhs
|
|
|
|
return false;
|
|
|
|
}
|
2016-01-07 09:40:35 -05:00
|
|
|
arg0 = mp_binary_op(op, arg0, arg1);
|
2015-10-08 09:58:15 -04:00
|
|
|
}
|
2017-12-23 07:49:48 -05:00
|
|
|
} else if (rule_id == RULE_shift_expr
|
2020-02-26 23:36:53 -05:00
|
|
|
|| rule_id == RULE_arith_expr
|
|
|
|
|| rule_id == RULE_term) {
|
2019-07-24 23:15:54 -04:00
|
|
|
// folding for binary ops: << >> + - * @ / % //
|
2015-10-08 09:58:15 -04:00
|
|
|
mp_parse_node_t pn = peek_result(parser, num_args - 1);
|
2016-01-07 09:40:35 -05:00
|
|
|
if (!mp_parse_node_get_int_maybe(pn, &arg0)) {
|
2015-10-08 09:58:15 -04:00
|
|
|
return false;
|
|
|
|
}
|
2015-12-17 08:06:05 -05:00
|
|
|
for (ssize_t i = num_args - 2; i >= 1; i -= 2) {
|
2015-10-08 09:58:15 -04:00
|
|
|
pn = peek_result(parser, i - 1);
|
2016-01-07 09:40:35 -05:00
|
|
|
mp_obj_t arg1;
|
|
|
|
if (!mp_parse_node_get_int_maybe(pn, &arg1)) {
|
2015-10-08 09:58:15 -04:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
mp_token_kind_t tok = MP_PARSE_NODE_LEAF_ARG(peek_result(parser, i));
|
2020-04-05 22:19:03 -04:00
|
|
|
if (tok == MP_TOKEN_OP_AT || tok == MP_TOKEN_OP_SLASH) {
|
|
|
|
// Can't fold @ or /
|
2015-10-08 09:58:15 -04:00
|
|
|
return false;
|
2016-01-07 09:40:35 -05:00
|
|
|
}
|
2019-07-24 22:15:42 -04:00
|
|
|
mp_binary_op_t op = MP_BINARY_OP_LSHIFT + (tok - MP_TOKEN_OP_DBL_LESS);
|
2016-01-07 09:40:35 -05:00
|
|
|
int rhs_sign = mp_obj_int_sign(arg1);
|
|
|
|
if (op <= MP_BINARY_OP_RSHIFT) {
|
|
|
|
// << and >> can't have negative rhs
|
|
|
|
if (rhs_sign < 0) {
|
2015-10-08 09:58:15 -04:00
|
|
|
return false;
|
|
|
|
}
|
2016-01-07 09:40:35 -05:00
|
|
|
} else if (op >= MP_BINARY_OP_FLOOR_DIVIDE) {
|
|
|
|
// % and // can't have zero rhs
|
|
|
|
if (rhs_sign == 0) {
|
2015-10-08 09:58:15 -04:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
2016-01-07 09:40:35 -05:00
|
|
|
arg0 = mp_binary_op(op, arg0, arg1);
|
2015-10-08 09:58:15 -04:00
|
|
|
}
|
2017-12-23 07:49:48 -05:00
|
|
|
} else if (rule_id == RULE_factor_2) {
|
2015-10-08 09:58:15 -04:00
|
|
|
// folding for unary ops: + - ~
|
|
|
|
mp_parse_node_t pn = peek_result(parser, 0);
|
2016-01-07 09:40:35 -05:00
|
|
|
if (!mp_parse_node_get_int_maybe(pn, &arg0)) {
|
2015-10-08 09:58:15 -04:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
mp_token_kind_t tok = MP_PARSE_NODE_LEAF_ARG(peek_result(parser, 1));
|
2016-01-12 16:06:39 -05:00
|
|
|
mp_unary_op_t op;
|
2019-07-24 22:15:42 -04:00
|
|
|
if (tok == MP_TOKEN_OP_TILDE) {
|
2016-01-07 09:40:35 -05:00
|
|
|
op = MP_UNARY_OP_INVERT;
|
2019-07-24 22:15:42 -04:00
|
|
|
} else {
|
|
|
|
assert(tok == MP_TOKEN_OP_PLUS || tok == MP_TOKEN_OP_MINUS); // should be
|
|
|
|
op = MP_UNARY_OP_POSITIVE + (tok - MP_TOKEN_OP_PLUS);
|
2015-10-08 09:58:15 -04:00
|
|
|
}
|
2016-01-07 09:40:35 -05:00
|
|
|
arg0 = mp_unary_op(op, arg0);
|
2015-10-08 09:58:15 -04:00
|
|
|
|
|
|
|
#if MICROPY_COMP_CONST
|
2017-12-23 07:49:48 -05:00
|
|
|
} else if (rule_id == RULE_expr_stmt) {
|
2015-10-08 09:58:15 -04:00
|
|
|
mp_parse_node_t pn1 = peek_result(parser, 0);
|
|
|
|
if (!MP_PARSE_NODE_IS_NULL(pn1)
|
|
|
|
&& !(MP_PARSE_NODE_IS_STRUCT_KIND(pn1, RULE_expr_stmt_augassign)
|
2020-02-26 23:36:53 -05:00
|
|
|
|| MP_PARSE_NODE_IS_STRUCT_KIND(pn1, RULE_expr_stmt_assign_list))) {
|
2015-10-08 09:58:15 -04:00
|
|
|
// this node is of the form <x> = <y>
|
|
|
|
mp_parse_node_t pn0 = peek_result(parser, 1);
|
|
|
|
if (MP_PARSE_NODE_IS_ID(pn0)
|
2016-04-13 10:21:47 -04:00
|
|
|
&& MP_PARSE_NODE_IS_STRUCT_KIND(pn1, RULE_atom_expr_normal)
|
2020-02-26 23:36:53 -05:00
|
|
|
&& MP_PARSE_NODE_IS_ID(((mp_parse_node_struct_t *)pn1)->nodes[0])
|
|
|
|
&& MP_PARSE_NODE_LEAF_ARG(((mp_parse_node_struct_t *)pn1)->nodes[0]) == MP_QSTR_const
|
|
|
|
&& MP_PARSE_NODE_IS_STRUCT_KIND(((mp_parse_node_struct_t *)pn1)->nodes[1], RULE_trailer_paren)
|
2015-10-08 09:58:15 -04:00
|
|
|
) {
|
|
|
|
// code to assign dynamic constants: id = const(value)
|
|
|
|
|
|
|
|
// get the id
|
|
|
|
qstr id = MP_PARSE_NODE_LEAF_ARG(pn0);
|
|
|
|
|
|
|
|
// get the value
|
2020-02-26 23:36:53 -05:00
|
|
|
mp_parse_node_t pn_value = ((mp_parse_node_struct_t *)((mp_parse_node_struct_t *)pn1)->nodes[1])->nodes[0];
|
py/parse: Allow all constant objects to be used in "X = const(o)".
Now that constant tuples are supported in the parser, eg (1, True, "str"),
it's a small step to allow anything that is a constant to be used with the
pattern:
from micropython import const
X = const(obj)
This commit makes the required changes to allow the following types of
constants:
from micropython import const
_INT = const(123)
_FLOAT = const(1.2)
_COMPLEX = const(3.4j)
_STR = const("str")
_BYTES = const(b"bytes")
_TUPLE = const((_INT, _STR, _BYTES))
_TUPLE2 = const((None, False, True, ..., (), _TUPLE))
Prior to this, only integers could be used in const(...).
Signed-off-by: Damien George <damien@micropython.org>
2022-04-14 10:45:25 -04:00
|
|
|
if (!mp_parse_node_is_const(pn_value)) {
|
2017-02-23 22:56:37 -05:00
|
|
|
mp_obj_t exc = mp_obj_new_exception_msg(&mp_type_SyntaxError,
|
py/parse: Allow all constant objects to be used in "X = const(o)".
Now that constant tuples are supported in the parser, eg (1, True, "str"),
it's a small step to allow anything that is a constant to be used with the
pattern:
from micropython import const
X = const(obj)
This commit makes the required changes to allow the following types of
constants:
from micropython import const
_INT = const(123)
_FLOAT = const(1.2)
_COMPLEX = const(3.4j)
_STR = const("str")
_BYTES = const(b"bytes")
_TUPLE = const((_INT, _STR, _BYTES))
_TUPLE2 = const((None, False, True, ..., (), _TUPLE))
Prior to this, only integers could be used in const(...).
Signed-off-by: Damien George <damien@micropython.org>
2022-04-14 10:45:25 -04:00
|
|
|
MP_ERROR_TEXT("not a constant"));
|
2017-02-23 22:56:37 -05:00
|
|
|
mp_obj_exception_add_traceback(exc, parser->lexer->source_name,
|
2020-02-26 23:36:53 -05:00
|
|
|
((mp_parse_node_struct_t *)pn1)->source_line, MP_QSTRnull);
|
2017-02-23 22:56:37 -05:00
|
|
|
nlr_raise(exc);
|
2015-10-08 09:58:15 -04:00
|
|
|
}
|
py/parse: Allow all constant objects to be used in "X = const(o)".
Now that constant tuples are supported in the parser, eg (1, True, "str"),
it's a small step to allow anything that is a constant to be used with the
pattern:
from micropython import const
X = const(obj)
This commit makes the required changes to allow the following types of
constants:
from micropython import const
_INT = const(123)
_FLOAT = const(1.2)
_COMPLEX = const(3.4j)
_STR = const("str")
_BYTES = const(b"bytes")
_TUPLE = const((_INT, _STR, _BYTES))
_TUPLE2 = const((None, False, True, ..., (), _TUPLE))
Prior to this, only integers could be used in const(...).
Signed-off-by: Damien George <damien@micropython.org>
2022-04-14 10:45:25 -04:00
|
|
|
mp_obj_t value = mp_parse_node_convert_to_obj(pn_value);
|
2015-10-08 09:58:15 -04:00
|
|
|
|
|
|
|
// store the value in the table of dynamic constants
|
|
|
|
mp_map_elem_t *elem = mp_map_lookup(&parser->consts, MP_OBJ_NEW_QSTR(id), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
|
|
|
|
assert(elem->value == MP_OBJ_NULL);
|
2017-02-23 21:03:44 -05:00
|
|
|
elem->value = value;
|
2015-10-08 09:58:15 -04:00
|
|
|
|
2016-06-06 12:28:32 -04:00
|
|
|
// If the constant starts with an underscore then treat it as a private
|
|
|
|
// variable and don't emit any code to store the value to the id.
|
|
|
|
if (qstr_str(id)[0] == '_') {
|
|
|
|
pop_result(parser); // pop const(value)
|
|
|
|
pop_result(parser); // pop id
|
2017-12-23 07:49:48 -05:00
|
|
|
push_result_rule(parser, 0, RULE_pass_stmt, 0); // replace with "pass"
|
2016-06-06 12:28:32 -04:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2015-10-08 09:58:15 -04:00
|
|
|
// replace const(value) with value
|
|
|
|
pop_result(parser);
|
|
|
|
push_result_node(parser, pn_value);
|
|
|
|
|
|
|
|
// finished folding this assignment, but we still want it to be part of the tree
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if MICROPY_COMP_MODULE_CONST
|
2017-12-23 07:49:48 -05:00
|
|
|
} else if (rule_id == RULE_atom_expr_normal) {
|
2016-04-13 10:21:47 -04:00
|
|
|
mp_parse_node_t pn0 = peek_result(parser, 1);
|
|
|
|
mp_parse_node_t pn1 = peek_result(parser, 0);
|
2015-10-08 09:58:15 -04:00
|
|
|
if (!(MP_PARSE_NODE_IS_ID(pn0)
|
2020-02-26 23:36:53 -05:00
|
|
|
&& MP_PARSE_NODE_IS_STRUCT_KIND(pn1, RULE_trailer_period))) {
|
2015-10-08 09:58:15 -04:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
// id1.id2
|
|
|
|
// look it up in constant table, see if it can be replaced with an integer
|
2020-02-26 23:36:53 -05:00
|
|
|
mp_parse_node_struct_t *pns1 = (mp_parse_node_struct_t *)pn1;
|
2015-10-08 09:58:15 -04:00
|
|
|
assert(MP_PARSE_NODE_IS_ID(pns1->nodes[0]));
|
|
|
|
qstr q_base = MP_PARSE_NODE_LEAF_ARG(pn0);
|
|
|
|
qstr q_attr = MP_PARSE_NODE_LEAF_ARG(pns1->nodes[0]);
|
2020-02-26 23:36:53 -05:00
|
|
|
mp_map_elem_t *elem = mp_map_lookup((mp_map_t *)&mp_constants_map, MP_OBJ_NEW_QSTR(q_base), MP_MAP_LOOKUP);
|
2015-10-08 09:58:15 -04:00
|
|
|
if (elem == NULL) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
mp_obj_t dest[2];
|
|
|
|
mp_load_method_maybe(elem->value, q_attr, dest);
|
2019-01-30 02:49:52 -05:00
|
|
|
if (!(dest[0] != MP_OBJ_NULL && mp_obj_is_int(dest[0]) && dest[1] == MP_OBJ_NULL)) {
|
2015-10-08 09:58:15 -04:00
|
|
|
return false;
|
|
|
|
}
|
2016-01-07 09:40:35 -05:00
|
|
|
arg0 = dest[0];
|
2015-10-08 09:58:15 -04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
} else {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// success folding this rule
|
|
|
|
|
2015-12-17 08:06:05 -05:00
|
|
|
for (size_t i = num_args; i > 0; i--) {
|
2015-10-08 09:58:15 -04:00
|
|
|
pop_result(parser);
|
|
|
|
}
|
py/parse: Allow all constant objects to be used in "X = const(o)".
Now that constant tuples are supported in the parser, eg (1, True, "str"),
it's a small step to allow anything that is a constant to be used with the
pattern:
from micropython import const
X = const(obj)
This commit makes the required changes to allow the following types of
constants:
from micropython import const
_INT = const(123)
_FLOAT = const(1.2)
_COMPLEX = const(3.4j)
_STR = const("str")
_BYTES = const(b"bytes")
_TUPLE = const((_INT, _STR, _BYTES))
_TUPLE2 = const((None, False, True, ..., (), _TUPLE))
Prior to this, only integers could be used in const(...).
Signed-off-by: Damien George <damien@micropython.org>
2022-04-14 10:45:25 -04:00
|
|
|
push_result_node(parser, make_node_const_object_optimised(parser, 0, arg0));
|
2015-10-08 09:58:15 -04:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
2023-05-02 23:12:54 -04:00
|
|
|
|
|
|
|
#endif // MICROPY_COMP_CONST_FOLDING
|
2015-10-08 09:58:15 -04:00
|
|
|
|
2022-03-30 23:27:47 -04:00
|
|
|
#if MICROPY_COMP_CONST_TUPLE
|
|
|
|
STATIC bool build_tuple_from_stack(parser_t *parser, size_t src_line, size_t num_args) {
|
|
|
|
for (size_t i = num_args; i > 0;) {
|
|
|
|
mp_parse_node_t pn = peek_result(parser, --i);
|
|
|
|
if (!mp_parse_node_is_const(pn)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(mp_obj_new_tuple(num_args, NULL));
|
|
|
|
for (size_t i = num_args; i > 0;) {
|
|
|
|
mp_parse_node_t pn = pop_result(parser);
|
|
|
|
tuple->items[--i] = mp_parse_node_convert_to_obj(pn);
|
|
|
|
if (MP_PARSE_NODE_IS_STRUCT(pn)) {
|
|
|
|
parser_free_parse_node_struct(parser, (mp_parse_node_struct_t *)pn);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
push_result_node(parser, make_node_const_object(parser, src_line, MP_OBJ_FROM_PTR(tuple)));
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
STATIC bool build_tuple(parser_t *parser, size_t src_line, uint8_t rule_id, size_t num_args) {
|
|
|
|
if (rule_id == RULE_testlist_comp) {
|
|
|
|
if (peek_rule(parser, 0) == RULE_atom_paren) {
|
|
|
|
// Tuple of the form "(a,)".
|
|
|
|
return build_tuple_from_stack(parser, src_line, num_args);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (rule_id == RULE_testlist_comp_3c) {
|
|
|
|
assert(peek_rule(parser, 0) == RULE_testlist_comp_3b);
|
|
|
|
assert(peek_rule(parser, 1) == RULE_testlist_comp);
|
|
|
|
if (peek_rule(parser, 2) == RULE_atom_paren) {
|
|
|
|
// Tuple of the form "(a, b)".
|
|
|
|
if (build_tuple_from_stack(parser, src_line, num_args)) {
|
|
|
|
parser->rule_stack_top -= 2; // discard 2 rules
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (rule_id == RULE_testlist_star_expr
|
|
|
|
|| rule_id == RULE_testlist
|
|
|
|
|| rule_id == RULE_subscriptlist) {
|
|
|
|
// Tuple of the form:
|
|
|
|
// - x = a, b
|
|
|
|
// - return a, b
|
|
|
|
// - for x in a, b: pass
|
|
|
|
// - x[a, b]
|
|
|
|
return build_tuple_from_stack(parser, src_line, num_args);
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2017-12-23 07:49:48 -05:00
|
|
|
STATIC void push_result_rule(parser_t *parser, size_t src_line, uint8_t rule_id, size_t num_args) {
|
2021-03-22 21:48:35 -04:00
|
|
|
// Simplify and optimise certain rules, to reduce memory usage and simplify the compiler.
|
2017-12-23 07:49:48 -05:00
|
|
|
if (rule_id == RULE_atom_paren) {
|
2021-03-22 21:48:35 -04:00
|
|
|
// Remove parenthesis around a single expression if possible.
|
|
|
|
// This atom_paren rule always has a single argument, and after this
|
|
|
|
// optimisation that argument is either NULL or testlist_comp.
|
2016-01-07 08:07:52 -05:00
|
|
|
mp_parse_node_t pn = peek_result(parser, 0);
|
|
|
|
if (MP_PARSE_NODE_IS_NULL(pn)) {
|
|
|
|
// need to keep parenthesis for ()
|
|
|
|
} else if (MP_PARSE_NODE_IS_STRUCT_KIND(pn, RULE_testlist_comp)) {
|
|
|
|
// need to keep parenthesis for (a, b, ...)
|
|
|
|
} else {
|
|
|
|
// parenthesis around a single expression, so it's just the expression
|
|
|
|
return;
|
|
|
|
}
|
2021-03-22 21:48:35 -04:00
|
|
|
} else if (rule_id == RULE_testlist_comp) {
|
|
|
|
// The testlist_comp rule can be the sole argument to either atom_parent
|
|
|
|
// or atom_bracket, for (...) and [...] respectively.
|
|
|
|
assert(num_args == 2);
|
|
|
|
mp_parse_node_t pn = peek_result(parser, 0);
|
|
|
|
if (MP_PARSE_NODE_IS_STRUCT(pn)) {
|
|
|
|
mp_parse_node_struct_t *pns = (mp_parse_node_struct_t *)pn;
|
|
|
|
if (MP_PARSE_NODE_STRUCT_KIND(pns) == RULE_testlist_comp_3b) {
|
|
|
|
// tuple of one item, with trailing comma
|
|
|
|
pop_result(parser);
|
|
|
|
--num_args;
|
|
|
|
} else if (MP_PARSE_NODE_STRUCT_KIND(pns) == RULE_testlist_comp_3c) {
|
|
|
|
// tuple of many items, convert testlist_comp_3c to testlist_comp
|
|
|
|
pop_result(parser);
|
|
|
|
assert(pn == peek_result(parser, 0));
|
|
|
|
pns->kind_num_nodes = rule_id | MP_PARSE_NODE_STRUCT_NUM_NODES(pns) << 8;
|
|
|
|
return;
|
|
|
|
} else if (MP_PARSE_NODE_STRUCT_KIND(pns) == RULE_comp_for) {
|
|
|
|
// generator expression
|
|
|
|
} else {
|
|
|
|
// tuple with 2 items
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// tuple with 2 items
|
|
|
|
}
|
|
|
|
} else if (rule_id == RULE_testlist_comp_3c) {
|
|
|
|
// steal first arg of outer testlist_comp rule
|
|
|
|
++num_args;
|
2016-01-07 08:07:52 -05:00
|
|
|
}
|
|
|
|
|
2015-10-08 09:58:15 -04:00
|
|
|
#if MICROPY_COMP_CONST_FOLDING
|
2017-12-23 07:49:48 -05:00
|
|
|
if (fold_logical_constants(parser, rule_id, &num_args)) {
|
2016-11-12 23:36:49 -05:00
|
|
|
// we folded this rule so return straight away
|
|
|
|
return;
|
|
|
|
}
|
2017-12-23 07:49:48 -05:00
|
|
|
if (fold_constants(parser, rule_id, num_args)) {
|
2015-10-08 09:58:15 -04:00
|
|
|
// we folded this rule so return straight away
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2022-03-30 23:27:47 -04:00
|
|
|
#if MICROPY_COMP_CONST_TUPLE
|
|
|
|
if (build_tuple(parser, src_line, rule_id, num_args)) {
|
2023-03-07 22:10:02 -05:00
|
|
|
// we built a tuple from this rule so return straight away
|
2022-03-30 23:27:47 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2015-09-23 05:50:43 -04:00
|
|
|
mp_parse_node_struct_t *pn = parser_alloc(parser, sizeof(mp_parse_node_struct_t) + sizeof(mp_parse_node_t) * num_args);
|
2014-04-10 10:27:31 -04:00
|
|
|
pn->source_line = src_line;
|
2017-12-23 07:49:48 -05:00
|
|
|
pn->kind_num_nodes = (rule_id & 0xff) | (num_args << 8);
|
2015-12-17 08:06:05 -05:00
|
|
|
for (size_t i = num_args; i > 0; i--) {
|
2013-10-04 14:53:11 -04:00
|
|
|
pn->nodes[i - 1] = pop_result(parser);
|
|
|
|
}
|
2021-03-22 21:48:35 -04:00
|
|
|
if (rule_id == RULE_testlist_comp_3c) {
|
|
|
|
// need to push something non-null to replace stolen first arg of testlist_comp
|
|
|
|
push_result_node(parser, (mp_parse_node_t)pn);
|
|
|
|
}
|
2013-12-21 13:17:45 -05:00
|
|
|
push_result_node(parser, (mp_parse_node_t)pn);
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
|
2015-09-23 05:50:43 -04:00
|
|
|
mp_parse_tree_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind) {
|
2014-01-12 08:55:24 -05:00
|
|
|
|
2014-05-10 12:36:41 -04:00
|
|
|
// initialise parser and allocate memory for its stacks
|
2014-01-12 08:55:24 -05:00
|
|
|
|
2014-05-10 12:36:41 -04:00
|
|
|
parser_t parser;
|
2014-01-12 08:55:24 -05:00
|
|
|
|
2014-05-21 15:32:59 -04:00
|
|
|
parser.rule_stack_alloc = MICROPY_ALLOC_PARSE_RULE_INIT;
|
2014-05-10 12:36:41 -04:00
|
|
|
parser.rule_stack_top = 0;
|
2017-02-23 22:56:37 -05:00
|
|
|
parser.rule_stack = m_new(rule_stack_t, parser.rule_stack_alloc);
|
2013-10-04 14:53:11 -04:00
|
|
|
|
2014-05-21 15:32:59 -04:00
|
|
|
parser.result_stack_alloc = MICROPY_ALLOC_PARSE_RESULT_INIT;
|
2014-05-10 12:36:41 -04:00
|
|
|
parser.result_stack_top = 0;
|
2017-02-23 22:56:37 -05:00
|
|
|
parser.result_stack = m_new(mp_parse_node_t, parser.result_stack_alloc);
|
2013-10-04 14:53:11 -04:00
|
|
|
|
2014-05-10 12:36:41 -04:00
|
|
|
parser.lexer = lex;
|
|
|
|
|
2015-09-23 05:50:43 -04:00
|
|
|
parser.tree.chunk = NULL;
|
|
|
|
parser.cur_chunk = NULL;
|
|
|
|
|
2015-10-08 09:58:15 -04:00
|
|
|
#if MICROPY_COMP_CONST
|
|
|
|
mp_map_init(&parser.consts, 0);
|
|
|
|
#endif
|
|
|
|
|
2014-01-12 08:55:24 -05:00
|
|
|
// work out the top-level rule to use, and push it on the stack
|
2015-12-17 08:06:05 -05:00
|
|
|
size_t top_level_rule;
|
2013-10-18 14:58:12 -04:00
|
|
|
switch (input_kind) {
|
2020-02-26 23:36:53 -05:00
|
|
|
case MP_PARSE_SINGLE_INPUT:
|
|
|
|
top_level_rule = RULE_single_input;
|
|
|
|
break;
|
|
|
|
case MP_PARSE_EVAL_INPUT:
|
|
|
|
top_level_rule = RULE_eval_input;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
top_level_rule = RULE_file_input;
|
2013-10-18 14:58:12 -04:00
|
|
|
}
|
2017-12-23 07:36:08 -05:00
|
|
|
push_rule(&parser, lex->tok_line, top_level_rule, 0);
|
2013-10-04 14:53:11 -04:00
|
|
|
|
2014-01-12 08:55:24 -05:00
|
|
|
// parse!
|
|
|
|
|
2013-10-04 14:53:11 -04:00
|
|
|
bool backtrack = false;
|
|
|
|
|
|
|
|
for (;;) {
|
2020-02-26 23:36:53 -05:00
|
|
|
next_rule:
|
2017-02-23 22:56:37 -05:00
|
|
|
if (parser.rule_stack_top == 0) {
|
2013-10-04 14:53:11 -04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2017-12-23 08:01:02 -05:00
|
|
|
// Pop the next rule to process it
|
|
|
|
size_t i; // state for the current rule
|
|
|
|
size_t rule_src_line; // source line for the first token matched by the current rule
|
|
|
|
uint8_t rule_id = pop_rule(&parser, &i, &rule_src_line);
|
|
|
|
uint8_t rule_act = rule_act_table[rule_id];
|
2017-12-25 21:39:02 -05:00
|
|
|
const uint16_t *rule_arg = get_rule_arg(rule_id);
|
2017-12-23 08:01:02 -05:00
|
|
|
size_t n = rule_act & RULE_ACT_ARG_MASK;
|
2013-10-04 14:53:11 -04:00
|
|
|
|
2017-12-25 21:39:26 -05:00
|
|
|
#if 0
|
2013-10-04 14:53:11 -04:00
|
|
|
// debugging
|
2017-12-25 21:39:26 -05:00
|
|
|
printf("depth=" UINT_FMT " ", parser.rule_stack_top);
|
2014-05-10 12:36:41 -04:00
|
|
|
for (int j = 0; j < parser.rule_stack_top; ++j) {
|
2013-10-04 14:53:11 -04:00
|
|
|
printf(" ");
|
|
|
|
}
|
2017-12-25 21:39:26 -05:00
|
|
|
printf("%s n=" UINT_FMT " i=" UINT_FMT " bt=%d\n", rule_name_table[rule_id], n, i, backtrack);
|
|
|
|
#endif
|
2013-10-04 14:53:11 -04:00
|
|
|
|
2017-12-23 08:01:02 -05:00
|
|
|
switch (rule_act & RULE_ACT_KIND_MASK) {
|
2013-10-04 14:53:11 -04:00
|
|
|
case RULE_ACT_OR:
|
|
|
|
if (i > 0 && !backtrack) {
|
|
|
|
goto next_rule;
|
|
|
|
} else {
|
|
|
|
backtrack = false;
|
|
|
|
}
|
2015-07-24 10:35:57 -04:00
|
|
|
for (; i < n; ++i) {
|
2017-12-23 08:01:02 -05:00
|
|
|
uint16_t kind = rule_arg[i] & RULE_ARG_KIND_MASK;
|
2015-07-24 10:35:57 -04:00
|
|
|
if (kind == RULE_ARG_TOK) {
|
2017-12-23 08:01:02 -05:00
|
|
|
if (lex->tok_kind == (rule_arg[i] & RULE_ARG_ARG_MASK)) {
|
|
|
|
push_result_token(&parser, rule_id);
|
2015-07-24 10:35:57 -04:00
|
|
|
mp_lexer_to_next(lex);
|
2013-10-04 14:53:11 -04:00
|
|
|
goto next_rule;
|
2015-07-24 10:35:57 -04:00
|
|
|
}
|
2013-10-04 14:53:11 -04:00
|
|
|
} else {
|
2015-07-24 10:35:57 -04:00
|
|
|
assert(kind == RULE_ARG_RULE);
|
|
|
|
if (i + 1 < n) {
|
2017-12-23 08:01:02 -05:00
|
|
|
push_rule(&parser, rule_src_line, rule_id, i + 1); // save this or-rule
|
2015-07-24 10:35:57 -04:00
|
|
|
}
|
2017-12-23 08:01:02 -05:00
|
|
|
push_rule_from_arg(&parser, rule_arg[i]); // push child of or-rule
|
2013-10-04 14:53:11 -04:00
|
|
|
goto next_rule;
|
|
|
|
}
|
|
|
|
}
|
2015-07-24 10:35:57 -04:00
|
|
|
backtrack = true;
|
2013-10-04 14:53:11 -04:00
|
|
|
break;
|
|
|
|
|
2014-12-20 13:06:08 -05:00
|
|
|
case RULE_ACT_AND: {
|
2013-10-04 14:53:11 -04:00
|
|
|
|
|
|
|
// failed, backtrack if we can, else syntax error
|
|
|
|
if (backtrack) {
|
|
|
|
assert(i > 0);
|
2017-12-23 08:01:02 -05:00
|
|
|
if ((rule_arg[i - 1] & RULE_ARG_KIND_MASK) == RULE_ARG_OPT_RULE) {
|
2013-10-04 14:53:11 -04:00
|
|
|
// an optional rule that failed, so continue with next arg
|
2014-05-10 12:36:41 -04:00
|
|
|
push_result_node(&parser, MP_PARSE_NODE_NULL);
|
2013-10-04 14:53:11 -04:00
|
|
|
backtrack = false;
|
|
|
|
} else {
|
|
|
|
// a mandatory rule that failed, so propagate backtrack
|
|
|
|
if (i > 1) {
|
|
|
|
// already eaten tokens so can't backtrack
|
|
|
|
goto syntax_error;
|
|
|
|
} else {
|
|
|
|
goto next_rule;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// progress through the rule
|
|
|
|
for (; i < n; ++i) {
|
2017-12-23 08:01:02 -05:00
|
|
|
if ((rule_arg[i] & RULE_ARG_KIND_MASK) == RULE_ARG_TOK) {
|
2017-01-17 01:00:55 -05:00
|
|
|
// need to match a token
|
2017-12-23 08:01:02 -05:00
|
|
|
mp_token_kind_t tok_kind = rule_arg[i] & RULE_ARG_ARG_MASK;
|
2017-01-17 01:00:55 -05:00
|
|
|
if (lex->tok_kind == tok_kind) {
|
|
|
|
// matched token
|
|
|
|
if (tok_kind == MP_TOKEN_NAME) {
|
2017-12-23 08:01:02 -05:00
|
|
|
push_result_token(&parser, rule_id);
|
2017-01-17 01:00:55 -05:00
|
|
|
}
|
|
|
|
mp_lexer_to_next(lex);
|
|
|
|
} else {
|
|
|
|
// failed to match token
|
|
|
|
if (i > 0) {
|
|
|
|
// already eaten tokens so can't backtrack
|
|
|
|
goto syntax_error;
|
2013-10-04 14:53:11 -04:00
|
|
|
} else {
|
2017-01-17 01:00:55 -05:00
|
|
|
// this rule failed, so backtrack
|
|
|
|
backtrack = true;
|
|
|
|
goto next_rule;
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
2015-01-14 16:32:42 -05:00
|
|
|
}
|
2017-01-17 01:00:55 -05:00
|
|
|
} else {
|
2017-12-23 08:01:02 -05:00
|
|
|
push_rule(&parser, rule_src_line, rule_id, i + 1); // save this and-rule
|
|
|
|
push_rule_from_arg(&parser, rule_arg[i]); // push child of and-rule
|
2017-01-17 01:00:55 -05:00
|
|
|
goto next_rule;
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(i == n);
|
|
|
|
|
|
|
|
// matched the rule, so now build the corresponding parse_node
|
|
|
|
|
2015-08-14 07:24:11 -04:00
|
|
|
#if !MICROPY_ENABLE_DOC_STRING
|
2014-05-25 17:06:06 -04:00
|
|
|
// this code discards lonely statements, such as doc strings
|
2017-12-23 08:01:02 -05:00
|
|
|
if (input_kind != MP_PARSE_SINGLE_INPUT && rule_id == RULE_expr_stmt && peek_result(&parser, 0) == MP_PARSE_NODE_NULL) {
|
2014-05-10 12:36:41 -04:00
|
|
|
mp_parse_node_t p = peek_result(&parser, 1);
|
2017-02-23 21:43:43 -05:00
|
|
|
if ((MP_PARSE_NODE_IS_LEAF(p) && !MP_PARSE_NODE_IS_ID(p))
|
|
|
|
|| MP_PARSE_NODE_IS_STRUCT_KIND(p, RULE_const_object)) {
|
2014-09-23 11:31:56 -04:00
|
|
|
pop_result(&parser); // MP_PARSE_NODE_NULL
|
2017-02-23 21:43:43 -05:00
|
|
|
pop_result(&parser); // const expression (leaf or RULE_const_object)
|
|
|
|
// Pushing the "pass" rule here will overwrite any RULE_const_object
|
|
|
|
// entry that was on the result stack, allowing the GC to reclaim
|
|
|
|
// the memory from the const object when needed.
|
2017-12-23 07:49:48 -05:00
|
|
|
push_result_rule(&parser, rule_src_line, RULE_pass_stmt, 0);
|
2014-05-06 16:44:11 -04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2015-08-14 07:24:11 -04:00
|
|
|
#endif
|
2014-05-06 16:44:11 -04:00
|
|
|
|
2016-04-14 08:23:50 -04:00
|
|
|
// count number of arguments for the parse node
|
|
|
|
i = 0;
|
2015-12-17 08:06:05 -05:00
|
|
|
size_t num_not_nil = 0;
|
2016-04-14 08:23:50 -04:00
|
|
|
for (size_t x = n; x > 0;) {
|
|
|
|
--x;
|
2017-12-23 08:01:02 -05:00
|
|
|
if ((rule_arg[x] & RULE_ARG_KIND_MASK) == RULE_ARG_TOK) {
|
|
|
|
mp_token_kind_t tok_kind = rule_arg[x] & RULE_ARG_ARG_MASK;
|
2016-04-14 08:23:50 -04:00
|
|
|
if (tok_kind == MP_TOKEN_NAME) {
|
|
|
|
// only tokens which were names are pushed to stack
|
|
|
|
i += 1;
|
|
|
|
num_not_nil += 1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// rules are always pushed
|
|
|
|
if (peek_result(&parser, i) != MP_PARSE_NODE_NULL) {
|
|
|
|
num_not_nil += 1;
|
|
|
|
}
|
|
|
|
i += 1;
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
}
|
2016-04-14 08:23:50 -04:00
|
|
|
|
2017-12-23 08:01:02 -05:00
|
|
|
if (num_not_nil == 1 && (rule_act & RULE_ACT_ALLOW_IDENT)) {
|
2016-04-14 08:23:50 -04:00
|
|
|
// this rule has only 1 argument and should not be emitted
|
2013-12-21 13:17:45 -05:00
|
|
|
mp_parse_node_t pn = MP_PARSE_NODE_NULL;
|
2015-12-17 08:06:05 -05:00
|
|
|
for (size_t x = 0; x < i; ++x) {
|
2014-05-10 12:36:41 -04:00
|
|
|
mp_parse_node_t pn2 = pop_result(&parser);
|
2013-12-21 13:17:45 -05:00
|
|
|
if (pn2 != MP_PARSE_NODE_NULL) {
|
2013-10-04 14:53:11 -04:00
|
|
|
pn = pn2;
|
|
|
|
}
|
|
|
|
}
|
2014-05-10 12:36:41 -04:00
|
|
|
push_result_node(&parser, pn);
|
2016-04-14 08:23:50 -04:00
|
|
|
} else {
|
|
|
|
// this rule must be emitted
|
|
|
|
|
2017-12-23 08:01:02 -05:00
|
|
|
if (rule_act & RULE_ACT_ADD_BLANK) {
|
2016-04-14 08:23:50 -04:00
|
|
|
// and add an extra blank node at the end (used by the compiler to store data)
|
|
|
|
push_result_node(&parser, MP_PARSE_NODE_NULL);
|
|
|
|
i += 1;
|
|
|
|
}
|
|
|
|
|
2017-12-23 08:01:02 -05:00
|
|
|
push_result_rule(&parser, rule_src_line, rule_id, i);
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
break;
|
2014-12-20 13:06:08 -05:00
|
|
|
}
|
2013-10-04 14:53:11 -04:00
|
|
|
|
2017-01-17 01:00:55 -05:00
|
|
|
default: {
|
2017-12-23 08:01:02 -05:00
|
|
|
assert((rule_act & RULE_ACT_KIND_MASK) == RULE_ACT_LIST);
|
2017-01-17 01:00:55 -05:00
|
|
|
|
2013-10-04 14:53:11 -04:00
|
|
|
// n=2 is: item item*
|
|
|
|
// n=1 is: item (sep item)*
|
|
|
|
// n=3 is: item (sep item)* [sep]
|
2014-12-20 13:06:08 -05:00
|
|
|
bool had_trailing_sep;
|
2013-10-04 14:53:11 -04:00
|
|
|
if (backtrack) {
|
2020-02-26 23:36:53 -05:00
|
|
|
list_backtrack:
|
2013-10-04 14:53:11 -04:00
|
|
|
had_trailing_sep = false;
|
|
|
|
if (n == 2) {
|
|
|
|
if (i == 1) {
|
|
|
|
// fail on item, first time round; propagate backtrack
|
|
|
|
goto next_rule;
|
|
|
|
} else {
|
|
|
|
// fail on item, in later rounds; finish with this rule
|
|
|
|
backtrack = false;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (i == 1) {
|
|
|
|
// fail on item, first time round; propagate backtrack
|
|
|
|
goto next_rule;
|
|
|
|
} else if ((i & 1) == 1) {
|
|
|
|
// fail on item, in later rounds; have eaten tokens so can't backtrack
|
|
|
|
if (n == 3) {
|
|
|
|
// list allows trailing separator; finish parsing list
|
|
|
|
had_trailing_sep = true;
|
|
|
|
backtrack = false;
|
|
|
|
} else {
|
|
|
|
// list doesn't allowing trailing separator; fail
|
|
|
|
goto syntax_error;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// fail on separator; finish parsing list
|
|
|
|
backtrack = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (;;) {
|
2017-12-23 08:01:02 -05:00
|
|
|
size_t arg = rule_arg[i & 1 & n];
|
2017-01-17 01:00:55 -05:00
|
|
|
if ((arg & RULE_ARG_KIND_MASK) == RULE_ARG_TOK) {
|
|
|
|
if (lex->tok_kind == (arg & RULE_ARG_ARG_MASK)) {
|
|
|
|
if (i & 1 & n) {
|
|
|
|
// separators which are tokens are not pushed to result stack
|
2013-10-04 14:53:11 -04:00
|
|
|
} else {
|
2017-12-23 08:01:02 -05:00
|
|
|
push_result_token(&parser, rule_id);
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
2017-01-17 01:00:55 -05:00
|
|
|
mp_lexer_to_next(lex);
|
|
|
|
// got element of list, so continue parsing list
|
|
|
|
i += 1;
|
|
|
|
} else {
|
|
|
|
// couldn't get element of list
|
|
|
|
i += 1;
|
|
|
|
backtrack = true;
|
|
|
|
goto list_backtrack;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
assert((arg & RULE_ARG_KIND_MASK) == RULE_ARG_RULE);
|
2017-12-23 08:01:02 -05:00
|
|
|
push_rule(&parser, rule_src_line, rule_id, i + 1); // save this list-rule
|
2017-01-17 01:00:55 -05:00
|
|
|
push_rule_from_arg(&parser, arg); // push child of list-rule
|
|
|
|
goto next_rule;
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
assert(i >= 1);
|
|
|
|
|
|
|
|
// compute number of elements in list, result in i
|
|
|
|
i -= 1;
|
2017-12-23 08:01:02 -05:00
|
|
|
if ((n & 1) && (rule_arg[1] & RULE_ARG_KIND_MASK) == RULE_ARG_TOK) {
|
2013-10-04 14:53:11 -04:00
|
|
|
// don't count separators when they are tokens
|
|
|
|
i = (i + 1) / 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i == 1) {
|
|
|
|
// list matched single item
|
|
|
|
if (had_trailing_sep) {
|
|
|
|
// if there was a trailing separator, make a list of a single item
|
2017-12-23 08:01:02 -05:00
|
|
|
push_result_rule(&parser, rule_src_line, rule_id, i);
|
2013-10-04 14:53:11 -04:00
|
|
|
} else {
|
|
|
|
// just leave single item on stack (ie don't wrap in a list)
|
|
|
|
}
|
|
|
|
} else {
|
2017-12-23 08:01:02 -05:00
|
|
|
push_result_rule(&parser, rule_src_line, rule_id, i);
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
break;
|
2014-12-20 13:06:08 -05:00
|
|
|
}
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
}
|
2013-10-09 10:09:52 -04:00
|
|
|
|
2015-10-08 09:58:15 -04:00
|
|
|
#if MICROPY_COMP_CONST
|
|
|
|
mp_map_deinit(&parser.consts);
|
|
|
|
#endif
|
|
|
|
|
2015-09-23 05:50:43 -04:00
|
|
|
// truncate final chunk and link into chain of chunks
|
|
|
|
if (parser.cur_chunk != NULL) {
|
2016-10-31 10:05:56 -04:00
|
|
|
(void)m_renew_maybe(byte, parser.cur_chunk,
|
2015-09-23 05:50:43 -04:00
|
|
|
sizeof(mp_parse_chunk_t) + parser.cur_chunk->alloc,
|
2016-10-31 10:05:56 -04:00
|
|
|
sizeof(mp_parse_chunk_t) + parser.cur_chunk->union_.used,
|
|
|
|
false);
|
2015-09-23 05:50:43 -04:00
|
|
|
parser.cur_chunk->alloc = parser.cur_chunk->union_.used;
|
|
|
|
parser.cur_chunk->union_.next = parser.tree.chunk;
|
|
|
|
parser.tree.chunk = parser.cur_chunk;
|
|
|
|
}
|
|
|
|
|
2017-02-23 22:56:37 -05:00
|
|
|
if (
|
2015-10-12 07:59:18 -04:00
|
|
|
lex->tok_kind != MP_TOKEN_END // check we are at the end of the token stream
|
|
|
|
|| parser.result_stack_top == 0 // check that we got a node (can fail on empty input)
|
|
|
|
) {
|
2017-02-23 22:56:37 -05:00
|
|
|
syntax_error:;
|
|
|
|
mp_obj_t exc;
|
2015-10-12 07:59:18 -04:00
|
|
|
if (lex->tok_kind == MP_TOKEN_INDENT) {
|
|
|
|
exc = mp_obj_new_exception_msg(&mp_type_IndentationError,
|
2020-03-02 06:35:22 -05:00
|
|
|
MP_ERROR_TEXT("unexpected indent"));
|
2015-10-12 07:59:18 -04:00
|
|
|
} else if (lex->tok_kind == MP_TOKEN_DEDENT_MISMATCH) {
|
|
|
|
exc = mp_obj_new_exception_msg(&mp_type_IndentationError,
|
2020-03-02 06:35:22 -05:00
|
|
|
MP_ERROR_TEXT("unindent doesn't match any outer indent level"));
|
2021-08-12 11:44:08 -04:00
|
|
|
#if MICROPY_PY_FSTRINGS
|
|
|
|
} else if (lex->tok_kind == MP_TOKEN_MALFORMED_FSTRING) {
|
|
|
|
exc = mp_obj_new_exception_msg(&mp_type_SyntaxError,
|
|
|
|
MP_ERROR_TEXT("malformed f-string"));
|
|
|
|
} else if (lex->tok_kind == MP_TOKEN_FSTRING_RAW) {
|
|
|
|
exc = mp_obj_new_exception_msg(&mp_type_SyntaxError,
|
|
|
|
MP_ERROR_TEXT("raw f-strings are not supported"));
|
|
|
|
#endif
|
2015-10-12 07:59:18 -04:00
|
|
|
} else {
|
|
|
|
exc = mp_obj_new_exception_msg(&mp_type_SyntaxError,
|
2020-03-02 06:35:22 -05:00
|
|
|
MP_ERROR_TEXT("invalid syntax"));
|
2015-10-12 07:59:18 -04:00
|
|
|
}
|
2017-02-23 22:56:37 -05:00
|
|
|
// add traceback to give info about file name and location
|
|
|
|
// we don't have a 'block' name, so just pass the NULL qstr to indicate this
|
2019-09-25 01:53:30 -04:00
|
|
|
mp_obj_exception_add_traceback(exc, lex->source_name, lex->tok_line, MP_QSTRnull);
|
2017-02-23 22:56:37 -05:00
|
|
|
nlr_raise(exc);
|
2015-07-24 11:05:56 -04:00
|
|
|
}
|
|
|
|
|
2017-02-23 22:56:37 -05:00
|
|
|
// get the root parse node that we created
|
|
|
|
assert(parser.result_stack_top == 1);
|
|
|
|
parser.tree.root = parser.result_stack[0];
|
|
|
|
|
2014-01-12 08:55:24 -05:00
|
|
|
// free the memory that we don't need anymore
|
2014-05-10 12:36:41 -04:00
|
|
|
m_del(rule_stack_t, parser.rule_stack, parser.rule_stack_alloc);
|
|
|
|
m_del(mp_parse_node_t, parser.result_stack, parser.result_stack_alloc);
|
2015-02-07 13:33:58 -05:00
|
|
|
|
2017-02-23 22:56:37 -05:00
|
|
|
// we also free the lexer on behalf of the caller
|
|
|
|
mp_lexer_free(lex);
|
|
|
|
|
|
|
|
return parser.tree;
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
2015-09-23 05:50:43 -04:00
|
|
|
|
|
|
|
void mp_parse_tree_clear(mp_parse_tree_t *tree) {
|
|
|
|
mp_parse_chunk_t *chunk = tree->chunk;
|
|
|
|
while (chunk != NULL) {
|
|
|
|
mp_parse_chunk_t *next = chunk->union_.next;
|
|
|
|
m_del(byte, chunk, sizeof(mp_parse_chunk_t) + chunk->alloc);
|
|
|
|
chunk = next;
|
|
|
|
}
|
|
|
|
}
|
2015-12-18 07:35:44 -05:00
|
|
|
|
|
|
|
#endif // MICROPY_ENABLE_COMPILER
|