TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

Merge map.h into obj.h.

Browse Source 
Pretty much everyone needs to include map.h, since it's such an integral
part of the Micro Python object implementation.  Thus, the definitions
are now in obj.h instead.  map.h is removed.
This commit is contained in:
Damien George
2014-03-30 13:54:02 +01:00
parent d17926db71
commit df6567e634
57 changed files with 61 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
py/map.c
View File

@@ -5,13 +5,12 @@
#include "qstr.h"
#include "obj.h"
#include "runtime0.h"
#include "map.h"
// approximatelly doubling primes; made with Mathematica command: Table[Prime[Floor[(1.7)^n]], {n, 3, 24}]
// prefixed with zero for the empty case.
STATIC int doubling_primes[] = {0, 7, 19, 43, 89, 179, 347, 647, 1229, 2297, 4243, 7829, 14347, 26017, 47149, 84947, 152443, 273253, 488399, 869927, 1547173, 2745121, 4861607};
int get_doubling_prime_greater_or_equal_to(int x) {
STATIC int get_doubling_prime_greater_or_equal_to(int x) {
for (int i = 0; i < sizeof(doubling_primes) / sizeof(int); i++) {
if (doubling_primes[i] >= x) {
return doubling_primes[i];