From 016f46666bddfae9177f43faa77522981841d558 Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 28 Apr 2023 13:25:35 +0000 Subject: [PATCH] Fix indentation and omit trailing whitespace in the random JSON generator script. FossilOrigin-Name: 629db09fceb7bf37561b52ccee06ebf4df261291e9a8ffcca82b243f6db5ff07 --- manifest | 12 +- manifest.uuid | 2 +- test/json/json-generator.tcl | 540 +++++++++++++++++------------------ 3 files changed, 277 insertions(+), 277 deletions(-) diff --git a/manifest b/manifest index 90577f373d..e9188432cd 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sjson_tree()\sso\sthat\sit\sis\sable\sto\sdeal\swith\sthe\sJNODE_RAW\slabels\sof\na\sJSON5\sobject. -D 2023-04-28T11:02:01.468 +C Fix\sindentation\sand\somit\strailing\swhitespace\sin\sthe\srandom\sJSON\sgenerator\nscript. +D 2023-04-28T13:25:35.641 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -1251,7 +1251,7 @@ F test/jrnlmode.test 9b5bc01dac22223cb60ec2d5f97acf568d73820794386de5634dcadbea9 F test/jrnlmode2.test 8759a1d4657c064637f8b079592651530db738419e1d649c6df7048cd724363d F test/jrnlmode3.test 556b447a05be0e0963f4311e95ab1632b11c9eaa F test/json/README.md 506af1f54574b524106acb50d1a341ab5ddfa6d83fe25095007892b07e663e85 -F test/json/json-generator.tcl 229bd293f1865f787c160886cadd282631721925cca2947aaa54bbcd7f65cef7 +F test/json/json-generator.tcl dc0dd0f393800c98658fc4c47eaa6af29d4e17527380cd28656fb261bddc8a3f F test/json/json-q1.txt 335a7c8ab291d354f33b7decc9559e99a2823d4142291c4be7aa339a631f3c2d F test/json/json-speed-check.sh 8b7babf530faa58bd59d6d362cec8e9036a68c5457ff46f3b1f1511d21af6737 x F test/json101.test de9c93169b84ac96fd5836c638a2ae1f00e4afbd4003c6b596692d7f05e1cd69 @@ -2066,8 +2066,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P b5ca15cfc19380cf870b70be6a86e70f2026cc3d6d89005b45891d58c4f11c2d -R fca31e8533435392332b7b8d5d313d4f +P f56528d413d8e622f7c4f18b2f9f2e620bfb441c020461299b35a90072ee6c13 +R 5da141bb06598ed103d496559df7ae36 U drh -Z 70e5d0234b5092ca91c1a96a87fa5d9d +Z 790f8e2b554134402e5889a19faba52a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3b090148dc..d1f6aa531d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f56528d413d8e622f7c4f18b2f9f2e620bfb441c020461299b35a90072ee6c13 \ No newline at end of file +629db09fceb7bf37561b52ccee06ebf4df261291e9a8ffcca82b243f6db5ff07 \ No newline at end of file diff --git a/test/json/json-generator.tcl b/test/json/json-generator.tcl index e99d6bccb0..d499bc7300 100644 --- a/test/json/json-generator.tcl +++ b/test/json/json-generator.tcl @@ -10,276 +10,276 @@ # expr srand(12345678) set wordlist { -ability able abroad access account act - action active actor add address adept - adroit advance advice affect age ageless - agency agent agile agree air airfare - airline airport alert almond alpha always - amend amount amplify analyst anchor angel - angelic angle ankle annual answer antique - anybody anyhow appeal apple apricot apt - area argon arm army arrival arsenic - art artful article arugula aside ask - aspect assist assume atom atone attempt - author autumn average avocado award awl - azure back bacon bag bagel bake - baker balance ball balloon bamboo banana - band banjo bank barium base basil - basin basis basket bass bat bath - battery beach beak bean bear bearcub - beauty beef beet beige being bell - belly belt bench bend benefit best - beta better beyond bicycle bid big - bike bill bird biscuit bismuth bisque - bit black blank blest blind bliss - block bloom blue board boat body - bokchoy bone bonus book bookish boot - border boron boss bossy bottle bottom - bow bowl bowtie box brain brainy - branch brave bravely bread break breath - breezy brick bridge brie brief briefly - bright broad broil bromine bronze brother - brow brown brush buddy budget buffalo - bug bugle bull bunch burger burly - burrito bus busy butter button buy - buyer byte cab cabbage cabinet cable - cadet cadmium caesium cake calcium caliper - call caller calm calmly camera camp - can canary cancel candle candy cap - capable caper capital captain car carbon - card care career careful carp carpet - carrot carry case cash cassava casual - cat catch catfish catsear catsup cause - cave celery cell century chain chair - chalk chance change channel chapter chard - charge charity chart check cheddar cheery - cheese chicken chicory chiffon child chin - chip chives choice chowder chum church - circle city claim clam class classic - classy clay clean cleaner clear clearly - clerk click client climate clock clorine - closet clothes cloud clown club clue - cluster coach coast coat cobbler cobolt - cod code coffee colby cold collar - college comb combine comet comfort command - comment common company complex concept concern - concert conduit consist contact contest context - control convert cook cookie copilot copper - copy coral cordial corn corner corny - correct cost count counter country county - couple courage course court cover cow - cowbird crab crack craft crash crazy - cream credit creek cress crevice crew - crimson croaker crop cross crowd cube - cuckoo cuisine culture cup current curve - cut cyan cycle dagger daily dance - dare darter data date day daylily - deal dear dearly debate debit decade - decimal deep deft deftly degree delay - deluxe deposit depth design desk detail - device dew diamond diet dig dill - dinner dip direct dirt dish disk - display diver divide divine doctor dodger - donut door dot double dough draft - drag dragon drama draw drawer drawing - dream drill drink drive driver drop - drum dry dryer drywall duck due - dump dusk dust duty dye eagle - ear earring earth ease east easy - eat economy edge editor eel effect - effort egg eight elbow elegant element - elf elk email emerald employ end - endive endless energy engine enjoy enter - entry equal equip error escape essay - eternal evening event exam example excuse - exit expert extent extreme eye face - fact factor factual fail failure fair - fajita fall family fan fang farm - farmer fat fault feature feed feel - feeling fench fennel festive few fiber - field fig figure file fill film - filter final finance finding finger finish - fire fish fishing fit fitting five - fix flier flight floor floral florine - flour flow flower fly flying focus - fold folding food foot force forest - forever forgive form formal format fortune - forum frame free freedom freely fresh - friend frog front fruit fuchsia fuel - fun funny future gain galaxy gallium - game gamma gap garage garden garlic - gas gate gather gauge gear gem - gene general gentle gently gherkin ghost - gift give glad glass gleeful glossy - glove glue goal goat goby gold - goldeye golf good gouda goulash gourd - grab grace grade gram grand grape - grapes grass gravy gray great green - grits grocery ground group grouper grout - growth guard guave guess guest guide - guitar gumbo guppy habit hacksaw haddock - hafnium hagfish hair half halibut hall - hammer hand handle handy hanger happy - hat havarti hay haybale head health - healthy hearing heart hearty heat heavy - heel height helium hello help helpful - herald herring hide high highly highway - hill hip hipster hire history hit - hoki hold hole holiday holly home - honest honey hook hope hopeful horizon - horn horse host hotel hour house - housing human humane humor hunt hurry - ice icecube icefish icy idea ideal - image impact impress inch income indigo - initial inkpen insect inside intense invite - iodine iridium iron island issue item - ivory jacket jargon javelin jello jelly - jewel job jocund join joint joke - jovial joy joyful joyous judge juice - jump junior jury just justice kale - keel keep kelp ketchup key keyhole - keyway khaki kick kid kidney kiloohm - kind kindly king kitchen kite kiwi - knee knife krill krypton kumquat lab - lace lack ladder lake lamp lamprey - land laser laugh law lawn lawyer - layer lead leader leading leaf leafy - league leather leave lecture leek leg - lemon length lentil lesson let letter - lettuce level library life lift light - lily lime limit line linen link - lip list listen lithium lively living - lizard load loan lobster local lock - log long longfin look lotus love - lovely loving low lucid luck luffa - lunch lung machine magenta magnet mail - main major make mall manager mango - manner many map march market maroon - martian master match math matter maximum - maybe meal meaning meat media medium - meet meeting melody melon member memory - mention menu mercury merry mess message - messy metal meter method micron middle - might mile milk mind mine minimum - minnow minor mint minute mirror miss - mission misty mix mixer mixture mobile - mode model moment monitor monk month - moon moray morning most motor mouse - mouth move mover movie much mud - mudfish muffin mullet munster muon muscle - music mustard nail name nation native - natural nature navy neat neatly nebula - neck needle neon nerve net network - neutron news nibble nice nickel night - niobium nobody noise noodle normal north - nose note nothing notice nova novel - number nurse nursery oar object offer - office officer oil okay okra old - olive one onion open opening opinion - option orange orbit orchid order oregano - other ounce outcome outside oven owner - oxygen oyster pace pack package page - pager paint pair pale pan pancake - papaya paper pardon parent park parking - parsley parsnip part partner party pass - passage past pasta path patient pattern - pause pay pea peace peach peacock - peahen peak peanut pear pearl pen - penalty pencil pension people pepper perch - perfect period permit person phase phone - photo phrase physics piano pick picture - pie piece pigeon pike pilot pin - pink pinkie pious pipe pitch pizza - place plan plane planet plant planter - plastic plate play player playful plenty - pliers plum pod poem poet poetry - point police policy pollock pony pool - pop popover poptart pork port portal - post pot potato pound powder power - present press price pride primary print - prior private prize problem process produce - product profile profit program project promise - prompt proof proper protein proton public - puff puffer pull pumpkin pup pupfish - pure purple purpose push put quality - quark quarter quiet quill quit quote - rabbit raccoon race radiant radio radish - radium radon rain rainbow raise ramp - ranch range rasp rate ratio ray - razor reach read reading real reality - reason recipe record recover red redeem - reed reef refuse region regret regular - relaxed release relief relish remote remove - rent repair repeat reply report request - reserve resist resolve resort rest result - return reveal review reward ribbon rice - rich ride ridge right ring rise - risk river rivet road roast rock - rocket role roll roof room rope - rose rough roughy round row royal - rub ruby rudder ruin rule run - runner rush rust sacred saddle safe - safety sail salad salami sale salmon - salt sample sand sander sandy sauce - save saving saw scale scampi scene - scheme school score screen script sea - search season seat second secret sector - seemly self sell senate senior sense - series serve set shake shape share - shark shell shift shine shiny ship - shock shoe shoot shop shovel show - side sign signal silk silly silver - simple sing singer single sink site - size skill skin sky slate sleep - sleepy slice slide slip smart smell - smelt smile smoke smooth snap snipe - snow snowy sock socket sodium soft - softly soil sole solid song sorrel - sort soul sound soup source south - space spare speech speed spell spend - sphere spice spider spirit spite split - spoon sport spot spray spread spring - squab square squash stable staff stage - stand staple star start state status - stay steak steel step stern stew - stick still stock stone stop store - storm story strain street stress strike - string stroke strong studio study stuff - style sugar suit sulfur summer sun - sunny sunset super superb surf survey - sweet swim swing switch symbol system - table tackle tail tale talk tan - tank tap tape target task taste - tau tea teach teal team tear - tell ten tender tennis tent term - test tetra text thanks theme theory - thing think thread throat thumb ticket - tidy tie tiger till time timely - tin tip title toast today toe - tomato tone tongue tool tooth top - topic total touch tough tour towel - tower town track trade train trash - travel tray treat tree trick trip - trout trowel truck trupet trust truth - try tube tuna tune turf turkey - turn turnip tutor tux tweet twist - two type union unique unit upbeat - upper use useful user usual valley - value van vase vast veil vein - velvet verse very vessel vest video - view violet visit visual vivid voice - volume vowel voyage waffle wait wake - walk wall warm warmth wasabi wash - watch water wave wax way wealth - wear web wedge week weekly weight - west whale what wheat wheel when - where while who whole why will - win wind window wing winner winter - wire wish witty wolf wonder wood - wool woolly word work worker world - worry worth worthy wrap wrench wrist - writer xenon yak yam yard yarrow - year yearly yellow yew yogurt young + ability able abroad access account act + action active actor add address adept + adroit advance advice affect age ageless + agency agent agile agree air airfare + airline airport alert almond alpha always + amend amount amplify analyst anchor angel + angelic angle ankle annual answer antique + anybody anyhow appeal apple apricot apt + area argon arm army arrival arsenic + art artful article arugula aside ask + aspect assist assume atom atone attempt + author autumn average avocado award awl + azure back bacon bag bagel bake + baker balance ball balloon bamboo banana + band banjo bank barium base basil + basin basis basket bass bat bath + battery beach beak bean bear bearcub + beauty beef beet beige being bell + belly belt bench bend benefit best + beta better beyond bicycle bid big + bike bill bird biscuit bismuth bisque + bit black blank blest blind bliss + block bloom blue board boat body + bokchoy bone bonus book bookish boot + border boron boss bossy bottle bottom + bow bowl bowtie box brain brainy + branch brave bravely bread break breath + breezy brick bridge brie brief briefly + bright broad broil bromine bronze brother + brow brown brush buddy budget buffalo + bug bugle bull bunch burger burly + burrito bus busy butter button buy + buyer byte cab cabbage cabinet cable + cadet cadmium caesium cake calcium caliper + call caller calm calmly camera camp + can canary cancel candle candy cap + capable caper capital captain car carbon + card care career careful carp carpet + carrot carry case cash cassava casual + cat catch catfish catsear catsup cause + cave celery cell century chain chair + chalk chance change channel chapter chard + charge charity chart check cheddar cheery + cheese chicken chicory chiffon child chin + chip chives choice chowder chum church + circle city claim clam class classic + classy clay clean cleaner clear clearly + clerk click client climate clock clorine + closet clothes cloud clown club clue + cluster coach coast coat cobbler cobolt + cod code coffee colby cold collar + college comb combine comet comfort command + comment common company complex concept concern + concert conduit consist contact contest context + control convert cook cookie copilot copper + copy coral cordial corn corner corny + correct cost count counter country county + couple courage course court cover cow + cowbird crab crack craft crash crazy + cream credit creek cress crevice crew + crimson croaker crop cross crowd cube + cuckoo cuisine culture cup current curve + cut cyan cycle dagger daily dance + dare darter data date day daylily + deal dear dearly debate debit decade + decimal deep deft deftly degree delay + deluxe deposit depth design desk detail + device dew diamond diet dig dill + dinner dip direct dirt dish disk + display diver divide divine doctor dodger + donut door dot double dough draft + drag dragon drama draw drawer drawing + dream drill drink drive driver drop + drum dry dryer drywall duck due + dump dusk dust duty dye eagle + ear earring earth ease east easy + eat economy edge editor eel effect + effort egg eight elbow elegant element + elf elk email emerald employ end + endive endless energy engine enjoy enter + entry equal equip error escape essay + eternal evening event exam example excuse + exit expert extent extreme eye face + fact factor factual fail failure fair + fajita fall family fan fang farm + farmer fat fault feature feed feel + feeling fench fennel festive few fiber + field fig figure file fill film + filter final finance finding finger finish + fire fish fishing fit fitting five + fix flier flight floor floral florine + flour flow flower fly flying focus + fold folding food foot force forest + forever forgive form formal format fortune + forum frame free freedom freely fresh + friend frog front fruit fuchsia fuel + fun funny future gain galaxy gallium + game gamma gap garage garden garlic + gas gate gather gauge gear gem + gene general gentle gently gherkin ghost + gift give glad glass gleeful glossy + glove glue goal goat goby gold + goldeye golf good gouda goulash gourd + grab grace grade gram grand grape + grapes grass gravy gray great green + grits grocery ground group grouper grout + growth guard guave guess guest guide + guitar gumbo guppy habit hacksaw haddock + hafnium hagfish hair half halibut hall + hammer hand handle handy hanger happy + hat havarti hay haybale head health + healthy hearing heart hearty heat heavy + heel height helium hello help helpful + herald herring hide high highly highway + hill hip hipster hire history hit + hoki hold hole holiday holly home + honest honey hook hope hopeful horizon + horn horse host hotel hour house + housing human humane humor hunt hurry + ice icecube icefish icy idea ideal + image impact impress inch income indigo + initial inkpen insect inside intense invite + iodine iridium iron island issue item + ivory jacket jargon javelin jello jelly + jewel job jocund join joint joke + jovial joy joyful joyous judge juice + jump junior jury just justice kale + keel keep kelp ketchup key keyhole + keyway khaki kick kid kidney kiloohm + kind kindly king kitchen kite kiwi + knee knife krill krypton kumquat lab + lace lack ladder lake lamp lamprey + land laser laugh law lawn lawyer + layer lead leader leading leaf leafy + league leather leave lecture leek leg + lemon length lentil lesson let letter + lettuce level library life lift light + lily lime limit line linen link + lip list listen lithium lively living + lizard load loan lobster local lock + log long longfin look lotus love + lovely loving low lucid luck luffa + lunch lung machine magenta magnet mail + main major make mall manager mango + manner many map march market maroon + martian master match math matter maximum + maybe meal meaning meat media medium + meet meeting melody melon member memory + mention menu mercury merry mess message + messy metal meter method micron middle + might mile milk mind mine minimum + minnow minor mint minute mirror miss + mission misty mix mixer mixture mobile + mode model moment monitor monk month + moon moray morning most motor mouse + mouth move mover movie much mud + mudfish muffin mullet munster muon muscle + music mustard nail name nation native + natural nature navy neat neatly nebula + neck needle neon nerve net network + neutron news nibble nice nickel night + niobium nobody noise noodle normal north + nose note nothing notice nova novel + number nurse nursery oar object offer + office officer oil okay okra old + olive one onion open opening opinion + option orange orbit orchid order oregano + other ounce outcome outside oven owner + oxygen oyster pace pack package page + pager paint pair pale pan pancake + papaya paper pardon parent park parking + parsley parsnip part partner party pass + passage past pasta path patient pattern + pause pay pea peace peach peacock + peahen peak peanut pear pearl pen + penalty pencil pension people pepper perch + perfect period permit person phase phone + photo phrase physics piano pick picture + pie piece pigeon pike pilot pin + pink pinkie pious pipe pitch pizza + place plan plane planet plant planter + plastic plate play player playful plenty + pliers plum pod poem poet poetry + point police policy pollock pony pool + pop popover poptart pork port portal + post pot potato pound powder power + present press price pride primary print + prior private prize problem process produce + product profile profit program project promise + prompt proof proper protein proton public + puff puffer pull pumpkin pup pupfish + pure purple purpose push put quality + quark quarter quiet quill quit quote + rabbit raccoon race radiant radio radish + radium radon rain rainbow raise ramp + ranch range rasp rate ratio ray + razor reach read reading real reality + reason recipe record recover red redeem + reed reef refuse region regret regular + relaxed release relief relish remote remove + rent repair repeat reply report request + reserve resist resolve resort rest result + return reveal review reward ribbon rice + rich ride ridge right ring rise + risk river rivet road roast rock + rocket role roll roof room rope + rose rough roughy round row royal + rub ruby rudder ruin rule run + runner rush rust sacred saddle safe + safety sail salad salami sale salmon + salt sample sand sander sandy sauce + save saving saw scale scampi scene + scheme school score screen script sea + search season seat second secret sector + seemly self sell senate senior sense + series serve set shake shape share + shark shell shift shine shiny ship + shock shoe shoot shop shovel show + side sign signal silk silly silver + simple sing singer single sink site + size skill skin sky slate sleep + sleepy slice slide slip smart smell + smelt smile smoke smooth snap snipe + snow snowy sock socket sodium soft + softly soil sole solid song sorrel + sort soul sound soup source south + space spare speech speed spell spend + sphere spice spider spirit spite split + spoon sport spot spray spread spring + squab square squash stable staff stage + stand staple star start state status + stay steak steel step stern stew + stick still stock stone stop store + storm story strain street stress strike + string stroke strong studio study stuff + style sugar suit sulfur summer sun + sunny sunset super superb surf survey + sweet swim swing switch symbol system + table tackle tail tale talk tan + tank tap tape target task taste + tau tea teach teal team tear + tell ten tender tennis tent term + test tetra text thanks theme theory + thing think thread throat thumb ticket + tidy tie tiger till time timely + tin tip title toast today toe + tomato tone tongue tool tooth top + topic total touch tough tour towel + tower town track trade train trash + travel tray treat tree trick trip + trout trowel truck trupet trust truth + try tube tuna tune turf turkey + turn turnip tutor tux tweet twist + two type union unique unit upbeat + upper use useful user usual valley + value van vase vast veil vein + velvet verse very vessel vest video + view violet visit visual vivid voice + volume vowel voyage waffle wait wake + walk wall warm warmth wasabi wash + watch water wave wax way wealth + wear web wedge week weekly weight + west whale what wheat wheel when + where while who whole why will + win wind window wing winner winter + wire wish witty wolf wonder wood + wool woolly word work worker world + worry worth worthy wrap wrench wrist + writer xenon yak yam yard yarrow + year yearly yellow yew yogurt young youth zebra zephyr zinc zone zoo } set nwordlist [llength $wordlist] -- 2.47.2