8000 wip: ports compile and pass smoke tests · cezer-io/circuitpython@2dd33e3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2dd33e3

Browse files
dhalbertdhalbert
committed
wip: ports compile and pass smoke tests
tests/ not run yet. Reduced some differences from upstream by changing some error messages and defining some preprocessor macros.
1 parent 1381e17 commit 2dd33e3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+520
-457
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ TAGS
102102
.cache
103103

104104
**/CLAUDE.local.md
105+
.claude
105106

106107
# windsurf rules
107108
.windsurfrules

‎lib/libm/libm.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
#include <stdint.h>
2020
#include <math.h>
2121

22+
// CIRCUITPY-CHANGE: prevent undefined warnings
23+
#ifndef FLT_EVAL_METHOD
24+
#define FLT_EVAL_METHOD 0
25+
#endif
26+
2227
// These lines verify that FLT_EVAL_METHOD==0, MicroPython's libm requires this.
2328
// If compilation fails here then check the host compiler's FLT_EVAL_METHOD.
2429
typedef float float_t;

‎locale/ID.po

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -321,15 +321,15 @@ msgid "'%q' object does not support '%q'"
321321
msgstr "Objek '%q' tidak mendukung '%q'"
322322

323323
#: py/runtime.c
324-
msgid "'%q' object is not an iterator"
324+
msgid "'%q' object isn't an iterator"
325325
msgstr "Objek '%q' bukan merupakan iterator"
326326

327327
#: py/objtype.c py/runtime.c shared-module/atexit/__init__.c
328328
msgid "'%q' object is not callable"
329329
msgstr "Objek '%q' tidak dapat dipanggil"
330330

331331
#: py/runtime.c
332-
msgid "'%q' object is not iterable"
332+
msgid "'%q' object isn't iterable"
333333
msgstr "Objek '%q' tidak dapat diulang 10000 "
334334

335335
#: py/emitinlinethumb.c py/emitinlinextensa.c
@@ -3193,7 +3193,7 @@ msgid "format"
31933193
msgstr ""
31943194

31953195
#: py/objstr.c
3196-
msgid "format requires a dict"
3196+
msgid "format needs a dict"
31973197
msgstr ""
31983198

31993199
#: py/objdeque.c
@@ -3652,7 +3652,7 @@ msgid "must use keyword argument for key function"
36523652
msgstr ""
36533653

36543654
#: py/runtime.c
3655-
msgid "name '%q' is not defined"
3655+
msgid "name '%q' isn't defined"
36563656
msgstr ""
36573657

36583658
#: py/runtime.c
@@ -4293,11 +4293,11 @@ msgid "tx and rx cannot both be None"
42934293
msgstr "tx dan rx keduanya tidak boleh kosong"
42944294

42954295
#: py/objtype.c
4296-
msgid "type '%q' is not an acceptable base type"
4296+
msgid "type '%q' isn't an acceptable base type"
42974297
msgstr ""
42984298

42994299
#: py/objtype.c
4300-
msgid "type is not an acceptable base type"
4300+
msgid "type isn't an acceptable base type"
43014301
msgstr ""
43024302

43034303
#: py/runtime.c
@@ -4710,13 +4710,13 @@ msgstr "Zi harus berbentuk (n_section, 2)"
47104710
#~ msgid "'%s' object does not support item deletion"
47114711
#~ msgstr "Objek '%s' tidak mendukung penghapusan item"
47124712

4713-
#~ msgid "'%s' object is not an iterator"
4713+
#~ msgid "'%s' object isn't an iterator"
47144714
#~ msgstr "Objek '%s' bukan iterator"
47154715

47164716
#~ msgid "'%s' object is not callable"
47174717
#~ msgstr "Objek '%s' tidak dapat dipanggil"
47184718

4719-
#~ msgid "'%s' object is not iterable"
4719+
#~ msgid "'%s' object isn't iterable"
47204720
#~ msgstr "'%s' objek tidak dapat diulang"
47214721

47224722
#~ msgid "'%s' object is not subscriptable"
@@ -5526,7 +5526,7 @@ msgstr "Zi harus berbentuk (n_section, 2)"
55265526
#~ msgid "frequency can only be either 80Mhz or 160MHz"
55275527
#~ msgstr "frekuensi hanya bisa didefinisikan 80Mhz atau 160Mhz"
55285528

5529-
#~ msgid "function does not take keyword arguments"
5529+
#~ msgid "function doesn't take keyword arguments"
55305530
#~ msgstr "fungsi tidak dapat mengambil argumen keyword"
55315531

55325532
#~ msgid "impossible baudrate"
@@ -5581,7 +5581,7 @@ msgstr "Zi harus berbentuk (n_section, 2)"
55815581
#~ msgid "name must be a string"
55825582
#~ msgstr "keyword harus berupa string"
55835583

5584-
#~ msgid "name reused for argument"
5584+
#~ msgid "argument name reused"
55855585
#~ msgstr "nama digunakan kembali untuk argumen"
55865586

55875587
#~ msgid "non-keyword arg after */**"

‎locale/circuitpython.pot

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ msgstr ""
6969

7070
#: py/objstr.c
7171
#, c-format
72-
msgid "%%c requires int or char"
72+
msgid "%%c needs int or char"
7373
msgstr ""
7474

7575
#: shared-bindings/rgbmatrix/RGBMatrix.c
@@ -309,15 +309,15 @@ msgid "'%q' object does not support '%q'"
309309
msgstr ""
310310

311311
#: py/runtime.c
312-
msgid "'%q' object is not an iterator"
312+
msgid "'%q' object isn't an iterator"
313313
msgstr ""
314314

315315
#: py/objtype.c py/runtime.c shared-module/atexit/__init__.c
316-
msgid "'%q' object is not callable"
316+
msgid "'%q' object isn't callable"
317317
msgstr ""
318318

319319
#: py/runtime.c
320-
msgid "'%q' object is not iterable"
320+
msgid "'%q' object isn't iterable"
321321
msgstr ""
322322

323323
#: py/emitinlinethumb.c py/emitinlinextensa.c
@@ -2728,6 +2728,10 @@ msgstr ""
27282728
msgid "can't convert to str implicitly"
27292729
msgstr ""
27302730

2731+
#: py/objtype.c
2732+
msgid "can't create '%q' instances"
2733+
msgstr ""
2734+
27312735
#: py/compile.c
27322736
msgid "can't declare nonlocal in outer code"
27332737
msgstr ""
@@ -2826,10 +2830,6 @@ msgstr ""
28262830
msgid "cannot convert complex type"
28272831
msgstr ""
28282832

2829-
#: py/objtype.c
2830-
msgid "cannot create '%q' instances"
2831-
msgstr ""
2832-
28332833
#: py/objtype.c
28342834
msgid "cannot create instance"
28352835
msgstr ""
@@ -3144,7 +3144,15 @@ msgid "format"
31443144
msgstr ""
31453145

31463146
#: py/objstr.c
3147-
msgid "format requires a dict"
3147+
msgid "format needs a dict"
3148+
msgstr ""
3149+
3150+
#: py/objstr.c
3151+
msgid "format string didn't convert all arguments"
3152+
msgstr ""
3153+
3154+
#: py/objstr.c
3155+
msgid "format string needs more arguments"
31483156
msgstr ""
31493157

31503158
#: py/objdeque.c
@@ -3603,7 +3611,7 @@ msgid "must use keyword argument for key function"
36033611
msgstr ""
36043612

36053613
#: py/runtime.c
3606-
msgid "name '%q' is not defined"
3614+
msgid "name '%q' isn't defined"
36073615
msgstr ""
36083616

36093617
#: py/runtime.c
@@ -3712,14 +3720,6 @@ msgstr ""
37123720
msgid "not a constant"
37133721
msgstr ""
37143722

3715-
#: py/objstr.c
3716-
msgid "not all arguments converted during string formatting"
3717-
msgstr ""
3718-
3719-
#: py/objstr.c
3720-
msgid "not enough arguments for format string"
3721-
msgstr ""
3722-
37233723
#: extmod/ulab/code/numpy/carray/carray_tools.c
37243724
msgid "not implemented for complex dtype"
37253725
msgstr ""
@@ -4236,11 +4236,11 @@ msgid "tx and rx cannot both be None"
42364236
msgstr ""
42374237

42384238
#: py/objtype.c
4239-
msgid "type '%q' is not an acceptable base type"
4239+
msgid "type '%q' isn't an acceptable base type"
42404240
msgstr ""
42414241

42424242
#: py/objtype.c
4243-
msgid "type is not an acceptable base type"
4243+
msgid "type isn't an acceptable base type"
42444244
msgstr ""
42454245

42464246
#: py/runtime.c

‎locale/cs.po

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -320,15 +320,15 @@ msgid "'%q' object does not support '%q'"
320320
msgstr "Objekt '%q' nepodporuje '%q'"
321321

322322
#: py/runtime.c
323-
msgid "'%q' object is not an iterator"
323+
msgid "'%q' object isn't an iterator"
324324
msgstr "Objekt '%q' není iterátor"
325325

326326
#: py/objtype.c py/runtime.c shared-module/atexit/__init__.c
327327
msgid "'%q' object is not callable"
328328
msgstr "Objekt '%q' nelze zavolat"
329329

330330
#: py/runtime.c
331-
msgid "'%q' object is not iterable"
331+
msgid "'%q' object isn't iterable"
332332
msgstr "Objekt '%q' není iterovatelný"
333333

334334
#: py/emitinlinethumb.c py/emitinlinextensa.c
@@ -3173,7 +3173,7 @@ msgid "format"
31733173
msgstr ""
31743174

31753175
#: py/objstr.c
3176-
msgid "format requires a dict"
3176+
msgid "format needs a dict"
31773177
msgstr ""
31783178

31793179
#: py/objdeque.c
@@ -3632,7 +3632,7 @@ msgid "must use keyword argument for key function"
36323632
msgstr ""
36333633

36343634
#: py/runtime.c
3635-
msgid "name '%q' is not defined"
3635+
msgid "name '%q' isn't defined"
36363636
msgstr ""
36373637

36383638
#: py/runtime.c
@@ -4273,11 +4273,11 @@ msgid "tx and rx cannot both be None"
42734273
msgstr ""
42744274

42754275
#: py/objtype.c
4276-
msgid "type '%q' is not an acceptable base type"
4276+
msgid "type '%q' isn't an acceptable base type"
42774277
msgstr ""
42784278

42794279
#: py/objtype.c
4280-
msgid "type is not an acceptable base type"
4280+
msgid "type isn't an acceptable base type"
42814281
msgstr ""
42824282

42834283
#: py/runtime.c
@@ -4703,7 +4703,7 @@ msgstr ""
47034703
#~ msgid "'continue' outside loop"
47044704
#~ msgstr "'continue' je volán mimo cyklus"
47054705

4706-
#~ msgid "'coroutine' object is not an iterator"
4706+
#~ msgid "'coroutine' object isn't an iterator"
47074707
#~ msgstr "Objekt 'coroutine' není iterátor"
47084708

47094709
#~ msgid "64 bit types"

‎locale/de_DE.po

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -324,15 +324,15 @@ msgid "'%q' object does not support '%q'"
324324
msgstr "'%q' Objekt unterstützt '%q' nicht"
325325

326326
#: py/runtime.c
327-
msgid "'%q' object is not an iterator"
327+
msgid "'%q' object isn't an iterator"
328328
msgstr "'%q' Objekt ist kein Iterator"
329329

330330
#: py/objtype.c py/runtime.c shared-module/atexit/__init__.c
331331
msgid "'%q' object is not callable"
332332
msgstr "'%q' Objekt ist kein callable"
333333

334334
#: py/runtime.c
335-
msgid "'%q' object is not iterable"
335+
msgid "'%q' object isn't iterable"
336336
msgstr "'%q' Objekt ist nicht iterierbar"
337337

338338
#: py/emitinlinethumb.c py/emitinlinextensa.c
@@ -3217,7 +3217,7 @@ msgid "format"
32173217
msgstr "Format"
32183218

32193219
#: py/objstr.c
3220-
msgid "format requires a dict"
3220+
msgid "format needs a dict"
32213221
msgstr "Format erfordert ein Wörterbuch (dict)"
32223222

32233223
#: py/objdeque.c
@@ -3684,7 +3684,7 @@ msgid "must use keyword argument for key function"
36843684
msgstr "muss Schlüsselwortargument für key function verwenden"
36853685

36863686
#: py/runtime.c
3687-
msgid "name '%q' is not defined"
3687+
msgid "name '%q' isn't defined"
36883688
msgstr "Name '%q' ist nirgends definiert worden (Schreibweise kontrollieren)"
36893689

36903690
#: py/runtime.c
@@ -4331,11 +4331,11 @@ msgid "tx and rx cannot both be None"
43314331
msgstr "tx und rx können nicht beide None sein"
43324332

43334333
#: py/objtype.c
4334-
msgid "type '%q' is not an acceptable base type"
4334+
msgid "type '%q' isn't an acceptable base type"
43354335
msgstr "Typ '%q' ist kein akzeptierter Basis-Typ"
43364336

43374337
#: py/objtype.c
4338-
msgid "type is not an acceptable base type"
4338+
msgid "type isn't an acceptable base type"
43394339
msgstr "Typ ist kein akzeptierter Basis-Typ"
43404340

43414341
#: py/runtime.c
@@ -4892,13 +4892,13 @@ msgstr "zi muss die Form (n_section, 2) haben"
48924892
#~ msgid "'%s' object does not support item deletion"
48934893
#~ msgstr "'%s' Objekt unterstützt das Löschen von Elementen nicht"
48944894

4895-
#~ msgid "'%s' object is not an iterator"
4895+
#~ msgid "'%s' object isn't an iterator"
48964896
#~ msgstr "'%s' Objekt ist kein Iterator"
48974897

48984898
#~ msgid "'%s' object is not callable"
48994899
#~ msgstr "'%s' object ist nicht aufrufbar"
49004900

4901-
#~ msgid "'%s' object is not iterable"
4901+
#~ msgid "'%s' object isn't iterable"
49024902
#~ msgstr "'%s' Objekt nicht iterierbar"
49034903

49044904
#~ msgid "'%s' object is not subscriptable"
@@ -4917,7 +4917,7 @@ msgstr "zi muss die Form (n_section, 2) haben"
49174917
#~ msgid "'continue' outside loop"
49184918
#~ msgstr "'continue' außerhalb einer Schleife"
49194919

4920-
#~ msgid "'coroutine' object is not an iterator"
4920+
#~ msgid "'coroutine' object isn't an iterator"
49214921
#~ msgstr "'coroutine' Objekt ist kein Iterator"
49224922

49234923
#~ msgid "(x,y) integers required"
@@ -6287,7 +6287,7 @@ msgstr "zi muss die Form (n_section, 2) haben"
62876287
#~ msgid "frequency is read-only for this board"
62886288
#~ msgstr "Frequenz ist für dieses Board schreibgeschützt"
62896289

6290-
#~ msgid "function does not take keyword arguments"
6290+
#~ msgid "function doesn't take keyword arguments"
62916291
#~ msgstr "Funktion akzeptiert keine Schlüsselwort-Argumente"
62926292

62936293
#~ msgid "function is implemented for scalars and ndarrays only"
@@ -6401,7 +6401,7 @@ msgstr "zi muss die Form (n_section, 2) haben"
64016401
#~ msgid "name must be a string"
64026402
#~ msgstr "name muss ein String sein"
64036403

6404-
#~ msgid "name reused for argument"
6404+
#~ msgid "argument name reused"
64056405
#~ msgstr "Name für Argumente wiederverwendet"
64066406

64076407
#~ msgid "no available NIC"

0 commit comments

Comments
 (0)
0