65dc960e3b
unix-cpy was originally written to get semantic equivalent with CPython without writing functional tests. When writing the initial implementation of uPy it was a long way between lexer and functional tests, so the half-way test was to make sure that the bytecode was correct. The idea was that if the uPy bytecode matched CPython 1-1 then uPy would be proper Python if the bytecodes acted correctly. And having matching bytecode meant that it was less likely to miss some deep subtlety in the Python semantics that would require an architectural change later on. But that is all history and it no longer makes sense to retain the ability to output CPython bytecode, because: 1. It outputs CPython 3.3 compatible bytecode. CPython's bytecode changes from version to version, and seems to have changed quite a bit in 3.5. There's no point in changing the bytecode output to match CPython anymore. 2. uPy and CPy do different optimisations to the bytecode which makes it harder to match. 3. The bytecode tests are not run. They were never part of Travis and are not run locally anymore. 4. The EMIT_CPYTHON option needs a lot of extra source code which adds heaps of noise, especially in compile.c. 5. Now that there is an extensive test suite (which tests functionality) there is no need to match the bytecode. Some very subtle behaviour is tested with the test suite and passing these tests is a much better way to stay Python-language compliant, rather than trying to match CPy bytecode.
86 lines
3.3 KiB
C
86 lines
3.3 KiB
C
/*
|
|
* This file is part of the Micro Python project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
*
|
|
* 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.
|
|
*/
|
|
#ifndef __MICROPY_INCLUDED_PY_SCOPE_H__
|
|
#define __MICROPY_INCLUDED_PY_SCOPE_H__
|
|
|
|
#include "py/parse.h"
|
|
#include "py/emitglue.h"
|
|
|
|
enum {
|
|
ID_INFO_KIND_GLOBAL_IMPLICIT,
|
|
ID_INFO_KIND_GLOBAL_EXPLICIT,
|
|
ID_INFO_KIND_LOCAL, // in a function f, written and only referenced by f
|
|
ID_INFO_KIND_CELL, // in a function f, read/written by children of f
|
|
ID_INFO_KIND_FREE, // in a function f, belongs to the parent of f
|
|
};
|
|
|
|
enum {
|
|
ID_FLAG_IS_PARAM = 0x01,
|
|
ID_FLAG_IS_STAR_PARAM = 0x02,
|
|
ID_FLAG_IS_DBL_STAR_PARAM = 0x04,
|
|
};
|
|
|
|
typedef struct _id_info_t {
|
|
uint8_t kind;
|
|
uint8_t flags;
|
|
// when it's an ID_INFO_KIND_LOCAL this is the unique number of the local
|
|
// whet it's an ID_INFO_KIND_CELL/FREE this is the unique number of the closed over variable
|
|
uint16_t local_num;
|
|
qstr qst;
|
|
} id_info_t;
|
|
|
|
// scope is a "block" in Python parlance
|
|
typedef enum { SCOPE_MODULE, SCOPE_FUNCTION, SCOPE_LAMBDA, SCOPE_LIST_COMP, SCOPE_DICT_COMP, SCOPE_SET_COMP, SCOPE_GEN_EXPR, SCOPE_CLASS } scope_kind_t;
|
|
typedef struct _scope_t {
|
|
scope_kind_t kind;
|
|
struct _scope_t *parent;
|
|
struct _scope_t *next;
|
|
mp_parse_node_t pn;
|
|
qstr source_file;
|
|
qstr simple_name;
|
|
mp_raw_code_t *raw_code;
|
|
uint8_t scope_flags; // see runtime0.h
|
|
uint8_t emit_options; // see compile.h
|
|
uint16_t num_pos_args;
|
|
uint16_t num_kwonly_args;
|
|
uint16_t num_locals;
|
|
uint16_t stack_size; // maximum size of the locals stack
|
|
uint16_t exc_stack_size; // maximum size of the exception stack
|
|
uint16_t id_info_alloc;
|
|
uint16_t id_info_len;
|
|
id_info_t *id_info;
|
|
} scope_t;
|
|
|
|
scope_t *scope_new(scope_kind_t kind, mp_parse_node_t pn, qstr source_file, mp_uint_t emit_options);
|
|
void scope_free(scope_t *scope);
|
|
id_info_t *scope_find_or_add_id(scope_t *scope, qstr qstr, bool *added);
|
|
id_info_t *scope_find(scope_t *scope, qstr qstr);
|
|
id_info_t *scope_find_global(scope_t *scope, qstr qstr);
|
|
id_info_t *scope_find_local_in_parent(scope_t *scope, qstr qstr);
|
|
void scope_close_over_in_parents(scope_t *scope, qstr qstr);
|
|
|
|
#endif // __MICROPY_INCLUDED_PY_SCOPE_H__
|