From e5ef15a9d7bead2a60009caedbc128a8906c7ecd Mon Sep 17 00:00:00 2001 From: Damien George Date: Wed, 16 Nov 2016 16:25:06 +1100 Subject: py/lexer: Provide generic mp_lexer_new_from_file based on mp_reader. If a port defines MICROPY_READER_POSIX or MICROPY_READER_FATFS then lexer.c now provides an implementation of mp_lexer_new_from_file using the mp_reader_new_file function. --- stmhal/Makefile | 1 - stmhal/lexerfatfs.c | 35 ----------------------------------- 2 files changed, 36 deletions(-) delete mode 100644 stmhal/lexerfatfs.c (limited to 'stmhal') diff --git a/stmhal/Makefile b/stmhal/Makefile index 59199ea0a..c08484db1 100644 --- a/stmhal/Makefile +++ b/stmhal/Makefile @@ -154,7 +154,6 @@ SRC_C = \ modusocket.c \ modnetwork.c \ import.c \ - lexerfatfs.c \ extint.c \ usrsw.c \ rng.c \ diff --git a/stmhal/lexerfatfs.c b/stmhal/lexerfatfs.c deleted file mode 100644 index fd7f62dfd..000000000 --- a/stmhal/lexerfatfs.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * This file is part of the MicroPython 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. - */ - -#include "py/lexer.h" - -mp_lexer_t *fat_vfs_lexer_new_from_file(const char *filename); - -// TODO: Instead of such shims, probably better to let port #define -// mp_lexer_new_from_file to a function it wants to use. -mp_lexer_t *mp_lexer_new_from_file(const char *filename) { - return fat_vfs_lexer_new_from_file(filename); -} -- cgit v1.2.3