- cl-store-cvs@common-lisp.net - mailman3.common-lisp.net

[cl-store-cvs] Is Israel a Democracy? -- The problem with intellectually insecure whites -- Should Christians Support Israeli Terrorism in Gaza?
by Lawrence Auster 23 Jan '09

23 Jan '09

The Jewish State of Israel has no constitution, nor does it name its borders. Israel's hidden constitution is Judaism. Israel's undeclared borders range from the Nile to the Euphrates rivers. Israel's desired jurisdiction extends over the entire Earth. It could not be more clear that the Jewish State follows a foreign policy which obeys Jewish Law as iterated in the Hebrew Bible, the Talmud, Maimonedes, the Cabalah, and the many commentaries and refinements of same. The Jews are genociding the native inhabitants of Palestine, just as their religion advises, and because their religion teaches them to do so. They treat non-Jews as if non-humans, just as their religion requires them to do. They make perpetual war on every nation on Earth, just as their genocidal Jewish God has instructed. The Jews of Israel are simply being Jews. Jews are an existential threat to the human race. Israel contains one third of the Jews of the World. It is not some aberration of the Jewish spirit, but the condensation and concentration of the perverse Jewish mentality, which malady also pervades the remaining two thirds of Jewry, who almost unanimously support the Jewish State, and who certainly do unanimously support the Jewish People and its consistent and constant crimes against the human race. Israel is Jewry and the danger of Israel is the danger of the Jewish People to all others, as the Jews have demonstrated each and every day of their existence. The Jews, the entire Jewish People of 15 million, will not relent until they have wiped out all non-Jews in "Greater Israel". They will not stop destroying all other cultures, nations, religions, ethnicities, races, competition, etc. until they are either stopped, or succeed in their ancient quest to destroy the human race. What Israel is doing is not some reaction to outside forces, nor was the formation of Israel a response to the Holocaust. Israel is simply following the plan laid out in the Jews' religious texts. The Jews have openly planned to take Palestine and genocide the native population of Palestine for some 2,500 years before the Holocaust. The Jews have openly complained that "anti-Semitism" is a threat that gives them the right to genocide the Palestinians, not merely since the advent of Nazism, but for some 2,500 years. The Jewish religion is the Constitution of the Jewish State of Israel, and, to a greater or lesser extent, the constitution of the nature of every Jew alive. The borders of Israel are the range the Jew roams over the entire World. The perverse Jewish mentality is inbred by a Jew's exposure to his parents and to his community. Judaism passes in the spit and slobber of Jewish mother telling her Jewish child that he is a "Jew", as much as Judaism passes in the poison and pain of a Talmudic tractate. The secular Jews did not suddenly come to life after the Enlightenment and the Jewish Reformation a body of vampires that appeared ex nihilo, in vacuo, mostly atheistical and undetached from formally practiced Judaism. Judaism is the Jew. It is a mindset that transcends and supercedes religion. It is a belief set, a way of life, a perception of one's self and one's relation to the World that makes a Jew, a Jew, and a danger to all of humanity. In fact, the religious shell of Judaism is like the stretched and infected skin of a lycanthropic pustule. When you lance it to cure the infection, the virus only becomes more contagious and spills directly on the non-Jew. The secular Jew is a deliberate product of the hyper-religious Jew, a monster created out of the hewed corpses of the fanatically religious Jew, a Golem which is conjured up to enter the World of the non-Jew and poison its blood, and boil its brain with a rabid lunacy that bites and spreads, until the infected community feeds on itself and fills the fields with rotting bloating bodies, where once human beings tilled the soil and tended to their families. The religious Jew created the secular Jew as an army of Esthers who seduce with open thighs, broad smiles, and a Siren call that lures in the non-Jew to cast his skull upon the jagged rocks and color the seas with his blood, sickened and blinded by the venereal disease of Judaism in secular form. Israel is not a secular democracy. It is a religious mockery. It is a rabid bat flying to the ends of the Earth, to end the Earth. No one will be free nor safe until the disease is quarantined and dies out. Source: http://www.ziopedia.org/articles/israel/how_can_israel_claim_to_be_a_%27dem… -------------------- The problem with intellectually insecure whites By Kevin MacDonald January 19, 2009 America will soon have a white minority. This is a much desired state of affairs for the hostile elites who hold political power and shape public opinion. But it certainly creates some management issues � at least in the long run. After all, it�s difficult to come up with an historical example of a nation with a solid ethnic majority (90% white in 1950) that has voluntarily decided to cede political and cultural power. Such transformations are typically accomplished by military invasions, great battles, and untold suffering. And it�s not as if everyone is doing it. Only Western nations view their own demographic and cultural eclipse as a moral imperative. Indeed, as I have noted previously, it is striking that racial nationalism has triumphed in Israel at the same time that the Jewish intellectual and political movements and the organized Jewish community have been the most active and effective force for a non-white America. Indeed, a poll in 2008 found that Avigdor Lieberman was the second most popular politician in Israel. Lieberman has advocated expulsion of Arabs from Israel and has declared himself a follower of Vladimir Jabotinsky, the leading pioneer of racial Zionism. The most popular politician in the poll was Benjamin Netanyahu � another admirer of Jabotinsky. Prime Minister Ehud Olmert and Foreign Minister Tzipi Livni are also Jabotinskyists. The racial Zionists are now carrying out yet another orgy of mass murder after a starvation-inducing blockade and the usual triggering assault designed to provoke Palestinian retaliation � which then becomes the cover for claims that Israel is merely defending itself against terrorism. This monstrosity was approved by overwhelming majorities of both Houses of Congress. The craven Bush administration did its part by abstaining from a UN resolution designed by the US Secretary of State as a result of a personal appeal by the Israeli Prime Minister. This is yet another accomplishment of the Israel Lobby, but one they would rather not have discussed in public. People might get the impression that the Lobby really does dictate US foreign policy in the Mideast. Obviously, such thoughts are only entertained by anti-Semites. But I digress. In managing the eclipse of white America, one strategy of the mainstream media is to simply ignore the issue. Christopher Donovan (�For the media, the less whites think about their coming minority status, the better�) has noted that the media, and in particular, the New York Times, are quite uninterested in doing stories that discuss what white people think about this state of affairs. It�s not surprising that the New York Times � the Jewish-owned flagship of anti-white, pro-multicultural media � ignores the issue. The issue is also missing from so-called conservative media even though one would think that conservatives would find the eclipse of white America to be an important issue. Certainly, their audiences would find it interesting. Now we have an article �The End of White America� written by Hua Hsu, an Assistant Professor of English at Vassar College. The article is a rather depressing display of what passes for intellectual discourse on the most important question confronting white people in America. Hsu begins by quoting a passage in F. Scott Fitzgerald�s The Great Gatsby in which a character, Tom Buchanan, states: �Have you read The Rise of the Colored Empires by this man Goddard?� � Well, it�s a fine book, and everybody ought to read it. The idea is if we don�t look out the white race will be�will be utterly submerged. It�s all scientific stuff; it�s been proved.� Buchanan�s comment is a thinly veiled reference to Lothrop Stoddard�s The Rising Tide of Color which Hsu describes as �rationalized hatred� presented in a scholarly, gentlemanly, and scientific tone. (This wording that will certainly help him when he comes up for tenure.) As Hsu notes, Stoddard had a doctorate from Harvard and was a member of many academic associations. His book was published by a major publisher. It was therefore �precisely the kind of book that a 1920s man of Buchanan�s profile � wealthy, Ivy League�educated, at once pretentious and intellectually insecure � might have been expected to bring up in casual conversation.� Let�s ponder that a bit. The simple reality is that in the year 2009 an Ivy League-educated person, "at once pretentious and intellectually insecure," would just as glibly assert the same sort of nonsense as Hsu. To wit: The coming white minority does not mean that the racial hierarchy of American culture will suddenly become inverted, as in 1995�s White Man�s Burden, an awful thought experiment of a film, starring John Travolta, that envisions an upside-down world in which whites are subjugated to their high-class black oppressors. There will be dislocations and resentments along the way, but the demographic shifts of the next 40 years are likely to reduce the power of racial hierarchies over everyone�s lives, producing a culture that�s more likely than any before to treat its inhabitants as individuals, rather than members of a caste or identity group. The fact is that no one can say for certain what multicultural America without a white majority will be like. There is no scientific or historical basis for claims like �the demographic shifts of the next 40 years are likely to reduce the power of racial hierarchies over everyone�s lives, producing a culture that�s more likely than any before to treat its inhabitants as individuals, rather than members of a caste or identity group.� Indeed, there is no evidence at all that we are proceeding to a color blind future. The election results continue to show that white people are coalescing in the Republican Party, while the Democrats are increasingly the party of a non-white soon-to-be majority. Is it so hard to believe that when this coalition achieves a majority that it will further compromise the interests of whites far beyond contemporary concerns such as immigration policy and affirmative action? Hsu anticipates a colorblind world, but affirmative action means that blacks and other minorities are certainly not treated as individuals. And it means that whites � especially white males � are losing out on opportunities they would have had without these policies and without the massive non-white immigration of the last few decades. Given the intractability of changing intelligence and other traits required for success in the contemporary economy, it is unlikely that 40 more years of affirmative action will attain the outcomes desired by the minority lobbies. Indeed, in Obama's America, blacks are rioting in Oakland over perceived racial injustices, and from 2002 �2007, black juvenile homicide victims increased 31%, while black juvenile homicide perpetrators increased 43%. Hence, the reasonable outlook is for a continuing need for affirmative action and for racial activism in these groups, even after whites become a minority. Whites will also lose out because of large-scale importation of relatively talented immigrants from East Asia. Indeed, as I noted over a decade ago, "The United States is well on the road to being dominated by an Asian technocratic elite and a Jewish business, professional, and media elite." Hsu shows that there already is considerable anxiety among whites about the future. An advertizing executive says, �I think white people feel like they�re under siege right now � like it�s not okay to be white right now, especially if you�re a white male. ... People are stressed out about it. �We used to be in control! We�re losing control�� Another says, "There�s a lot of fear and a lot of resentment." It's hard to see why these feelings won't increase in the future. A huge problem for white people is lack of intellectual and cultural confidence. Hsu quotes Christian (Stuff White People Like) Lander saying, "I get it: as a straight white male, I�m the worst thing on Earth." A professor comments that for his students "to be white is to be culturally broke. The classic thing white students say when you ask them to talk about who they are is, �I don�t have a culture.� They might be privileged, they might be loaded socioeconomically, but they feel bankrupt when it comes to culture � They feel disadvantaged, and they feel marginalized." This lack of cultural confidence is no accident. For nearly 100 years whites have been subjected to a culture of critique emanating from the most prestigious academic and media institutions. And, as Hsu points out, the most vibrant and influential aspect of American popular culture is hip-hop�a product of the African American urban culture. The only significant group of white people with any cultural confidence centers itself around country music, NASCAR, and the small town values of traditional white America. For this group of whites � and only this group � there is "a racial pride that dares not speak its name, and that defines itself through cultural cues instead�a suspicion of intellectual elites and city dwellers, a preference for folksiness and plainness of speech (whether real or feigned), and the association of a working-class white minority with 'the real America.'� This is what I term implicit whiteness � implicit because explicit assertions of white identity have been banned by the anti-white elites that dominate our politics and culture. It is a culture that, as Hsu notes, "cannot speak its name." But that implies that the submerged white identity of the white working class and the lack of cultural confidence exhibited by the rest of white America are imposed from outside. Although there may well be characteristics of whites that facilitate this process, this suppression of white identity and interests is certainly not the natural outcome of modernization or any other force internal to whites as a people. In my opinion, it is the result of the successful erection of a culture of critique in the West dominated by Jewish intellectual and political movements. The result is that educated, intellectually insecure white people these days are far more likely to believe in the utopian future described by Hsu than in hard and cautious thinking about what the future might have in store for them. It's worth dwelling a bit on the intellectual insecurity of the whites who mindlessly utter the mantras of multiculturalism that they have soaked up from the school system and from the media. Most people do not have much confidence in their intellectual ability and look to elite opinion to shape their beliefs. As I noted elsewhere, A critical component of the success of the culture of critique is that it achieved control of the most prestigious and influential institutions of the West, and it became a consensus among the elites, Jewish and non-Jewish alike. Once this happened, it is not surprising that this culture became widely accepted among people of very different levels of education and among people of different social classes. Most people are quite insecure about their intellectual ability. But they know that the professors at Harvard, and the editorial page of the New York Times and the Washington Post, and even conservative commentators like Rush Limbaugh and Sean Hannity are all on page when it comes to racial and ethnic issues. This is a formidable array, to the point that you almost have to be a crank to dissent from this consensus. I think one of the greatest triumphs of the left has been to get people to believe that people who assert white identity and interests or who make unflattering portrayals of organized Jewish movements are morally degenerate, stupid, and perhaps psychiatrically disturbed. Obviously, all of these adjectives designate low status. The reality is that the multicultural emperor has no clothes and, because of its support for racial Zionism and the racialism of ethnic minorities in America, it is massively hypocritical to boot. The New York Times, the academic left, and the faux conservatives that dominate elite discourse on race and ethnicity are intellectually bankrupt and can only remain in power by ruthlessly suppressing or ignoring the scientific findings. This is particularly a problem for college-educated whites. Like Fitzgerald's Tom Buchanan, such people have a strong need to feel that their ideas are respectable and part of the mainstream. But the respectable mainstream gives them absolutely nothing with which to validate themselves except perhaps the idea that the world will be a better place when people like them no longer have power. Hsu quotes the pathetic Christian Lander: "�Like, I�m aware of all the horrible crimes that my demographic has done in the world. ... And there�s a bunch of white people who are desperate � desperate � to say, �You know what? My skin�s white, but I�m not one of the white people who�s destroying the world.�� As a zombie leftist during the 1960s and 1970s, I know what that feeling of desperation is like � what it's like to be a self-hating white. We must get to the point where college-educated whites proudly and confidently say they are white and that they do not want to become a minority in America. This reminds me of the recent docudrama Milk, which depicts the life of gay activist Harvey Milk. Milk is sure be nominated for an Oscar as Best Picture because it lovingly illustrates a triumph of the cultural left. But is has an important message that should resonate with the millions of whites who have been deprived of their confidence and their culture: Be explicit. Just as Harvey Milk advocated being openly gay even in the face of dire consequences, whites need to tell their family and their friends that they have an identity as a white person and believe that whites have legitimate interests as white people. They must accept the consequences when they are harassed, fired from their jobs, or put in prison for such beliefs. They must run for political office as openly pro-white. Milk shows that homosexuals were fired from their jobs and arrested for congregating in public. Now it's the Southern Poverty Law Center and the rest of the leftist intellectual and political establishment that harasses and attempts to get people fired. But it's the same situation with the roles reversed. No revolution was ever accomplished without some martyrs. The revolution that restores the legitimacy of white identity and the legitimacy of white interests will be no exception. But it is a revolution that is absolutely necessary. The white majority is foolish indeed to entrust its future to a utopian hope that racial and ethnic identifications will disappear and that they won�t continue to influence public policy in ways that compromise the interests of whites. It does not take an overactive imagination to see that coalitions of minority groups could compromise the interests of formerly dominant whites. We already see numerous examples in which coalitions of minority groups attempt to influence public policy, including immigration policy, against the interests of the whites. Placing ourselves in a position of vulnerability would be extremely risky, given the deep sense of historical grievance fostered by many ethnic activists and organized ethnic lobbies. This is especially the case with Jews. Jewish organisations have been unanimous in condemning Western societies, Western traditions, and Christianity, for past crimes against Jews. Similar sentiments are typical of a great many African Americans and Latinos, and especially among the ethnic activists from these groups. The �God damn America� sermon by President Obama's pastor comes to mind as a recent notorious example. The precedent of the early decades of the Soviet Union should give pause to anyone who believes that surrendering ethnic hegemony does not carry risks. The Bolshevik revolution had a pronounced ethnic angle: To a very great extent, Jews and other non-Russians ruled over the Russian people, with disastrous consequences for the Russians and other ethnic groups that were not able to become part of the power structure. Jews formed a hostile elite within this power structure � as they will in the future white-minority America; Jews were �Stalin�s willing executioners.� Two passages from my review of Yuri Slezkine's The Jewish Century seem particularly appropriate here. The first passage reminds me of the many American Jews who adopt a veneer of support for leftist versions of social justice and racial tolerance while nevertheless managing to support racial Zionism and the mass murder, torture, and incarceration of the Palestinian people in one of the largest prison systems the world has ever seen. Such people may be very different when they become a hostile elite in a white-minority America. Many of the commentators on Jewish Bolsheviks noted the �transformation� of Jews [after the Bolshevik Revolution]. In the words of [a] Jewish commentator, G. A. Landau, �cruelty, sadism, and violence had seemed alien to a nation so far removed from physical activity.� And another Jewish commentator, Ia. A. Bromberg, noted that: the formerly oppressed lover of liberty had turned into a tyrant of �unheard-of-despotic arbitrariness��. The convinced and unconditional opponent of the death penalty not just for political crimes but for the most heinous offenses, who could not, as it were, watch a chicken being killed, has been transformed outwardly into a leather-clad person with a revolver and, in fact, lost all human likeness. ... After the Revolution, ... there was active suppression of any remnants of the older order and their descendants. ... The mass murder of peasants and nationalists was combined with the systematic exclusion of the previously existing non-Jewish middle class. The wife of a Leningrad University professor noted, �in all the institutions, only workers and Israelites are admitted; the life of the intelligentsia is very hard� (p. 243). Even at the end of the 1930s, prior to the Russification that accompanied World War II, �the Russian Federation�was still doing penance for its imperial past while also serving as an example of an ethnicity-free society� (p. 276). While all other nationalities, including Jews, were allowed and encouraged to keep their ethnic identities, the revolution remained an anti-majoritarian movement. The difference from the Soviet Union may well be that in white-minority America it will not be workers and Israelites who are favored, but non-whites and Israelites. Whites may dream that they are entering the post-racial utopia imagined by their erstwhile intellectual superiors. But it is quite possible that they are entering into a racial dystopia of unimaginable cruelty in which whites will be systematically excluded in favor of the new elites recruited from the soon-to-be majority. It's happened before. Kevin MacDonald is a professor of psychology at California State University�Long Beach. Permanent URL with hyperlinks: http://www.theoccidentalobserver.net/articles/MacDonald-Hsu.html ----------- Should Christians Support Israeli Terrorism in Gaza? A timely discussion between Rev. Ted Pike and Dr. David Duke, one especially important for the Christians in our audience http://www.davidduke.com/mp3/dukeradio090122DukeandPikeonGaza.mp3 In this vital discussion, Rev. Pike and Dr. Duke explore the Pro-Israel attitude of some Christian evangelical organizations, and why their position not only goes directly against Christian morality and decency, but actually is directly opposite of that expressed by Christian Scriptures. Today, Many Christians are instructed that Jews and today�s Israel has a special covenant� with God. In fact, the New Testament in the clearest of language states that the Jews �continued not in my covenant, and I considered them not, saith the Lord.� Here�s the quote that Christians aren�t supposed to notice.: 8:10 Not according to the covenant that I made with their fathers, in the day when I took them by the hand out of the land of Egypt; because they continued not in my covenant, and I regarded them not, saith the Lord. (Hebrews 8:10) They also don�t seem to notice that a 2000 year old Judaic war against Christianity that has been waged since time of Jesus Christ and still goes on today with the most powerful Jewish organizations attempting to destroy European and American traditions, that has even become a war on our Christmas traditions. Dr. Duke and Ted Pike also speak about how over a hundred thousand Christian Palestinians have suffered with their families from anti-Christian Israel! Christian support of Israel has resulted in the very birthplace of Jesus Christ, go from 90 percent Palestinian Christians to 35 percent today because of Israeli terror and occupation. They ask, �How could any Christian in good conscience support the anti-Christian state of Israel, bombing the homes, killing and maiming, torturing and oppressing fellow Christian men, women and children?� This is a vital show for every Christian reader and listener of DavidDuke.com. Next time, you hear someone say, �God tells us that we must support Israel� you will have the clear Christian answer that just the opposite is true! For documentation on this be sure to read some of the well-footnoted, sample chapters of Jewish Supremacism and My Awakening. Source : http://www.davidduke.com/general/should-christians-support-israeli-terroris… ------------------------------------- You or someone using your email adress is currently subscribed to the Lawrence Auster Newletter. If you wish to unsubscribe from our mailing list, please let us know by calling to 1 212 865 1284 Thanks, Lawrence Auster, 238 W 101 St Apt. 3B New York, NY 10025 Contact: lawrence.auster(a)att.net -------------------------------------

1 0

[cl-store-cvs] CVS cl-store/sbcl
by sross 17 Sep '07

17 Sep '07

Update of /project/cl-store/cvsroot/cl-store/sbcl In directory clnet:/tmp/cvs-serv1189/sbcl Modified Files: custom.lisp Log Message: faster (simple-array (unsigned-byte 8) (*)) storing. Thanks to Chris Dean more lenient parsing of sbcl version. Thanks to Gustavo --- /project/cl-store/cvsroot/cl-store/sbcl/custom.lisp 2006/12/14 18:15:43 1.13 +++ /project/cl-store/cvsroot/cl-store/sbcl/custom.lisp 2007/09/17 18:40:05 1.14 @@ -85,13 +85,30 @@ (funcall (compile nil `(lambda () ,@(sbcl-struct-defs dd)))) (find-class (dd-name dd))) +;;; with apologies to christophe rhodes ... +;; takes a source location as a third argument. +(eval-when (:compile-toplevel) + (defun split (string &optional max (ws '(#\Space #\Tab))) + (flet ((is-ws (char) (find char ws))) + (nreverse + (let ((list nil) (start 0) (words 0) end) + (loop + (when (and max (>= words (1- max))) + (return (cons (subseq string start) list))) + (setf end (position-if #'is-ws string :start start)) + (push (subseq string start end) list) + (incf words) + (unless end (return list)) + (setf start (1+ end)))))))) + ;; From 0.9.6.25 sb-kernel::%defstruct ;; takes a source location as a third argument. (eval-when (:compile-toplevel) (labels ((make-version (string) (map-into (make-list 4 :initial-element 0) - #'parse-integer - (asdf::split string nil '(#\.)))) + #'(lambda (part) + (parse-integer part :junk-allowed t)) + (split string nil '(#\.)))) (version>= (v1 v2) (loop for x in (make-version v1) for y in (make-version v2)

1 0

[cl-store-cvs] CVS cl-store/allegrocl
by sross 17 Sep '07

17 Sep '07

Update of /project/cl-store/cvsroot/cl-store/allegrocl In directory clnet:/tmp/cvs-serv1189/allegrocl Added Files: custom.lisp Log Message: faster (simple-array (unsigned-byte 8) (*)) storing. Thanks to Chris Dean more lenient parsing of sbcl version. Thanks to Gustavo --- /project/cl-store/cvsroot/cl-store/allegrocl/custom.lisp 2007/09/17 18:40:04 NONE +++ /project/cl-store/cvsroot/cl-store/allegrocl/custom.lisp 2007/09/17 18:40:04 1.1 ;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- ;; See the file LICENCE for licence information. (in-package :cl-store) (defun setup-special-floats () (flet ((short-float-values () (list (cons #.excl::*infinity-single* +short-float-inf+) (cons #.excl::*negative-infinity-single* +short-float-neg-inf+) (cons #.excl::*nan-single* +short-float-nan+))) (single-float-values () (list (cons #.excl::*infinity-single* +single-float-inf+) (cons #.excl::*negative-infinity-single* +single-float-neg-inf+) (cons #.excl::*nan-single* +single-float-nan+))) (double-float-values () (list (cons #.excl::*infinity-double* +double-float-inf+) (cons #.excl::*negative-infinity-double* +double-float-neg-inf+) (cons #.excl::*nan-double* +double-float-nan+))) (long-float-values () (list (cons #.excl::*infinity-double* +long-float-inf+) (cons #.excl::*negative-infinity-double* +long-float-neg-inf+) (cons #.excl::*nan-double* +long-float-nan+)))) (setf *special-floats* (append (short-float-values) (single-float-values) (double-float-values) (long-float-values))))) ;; EOF

1 0

[cl-store-cvs] CVS cl-store
by sross 17 Sep '07

17 Sep '07

Update of /project/cl-store/cvsroot/cl-store In directory clnet:/tmp/cvs-serv1189 Modified Files: ChangeLog cl-store.asd default-backend.lisp package.lisp plumbing.lisp tests.lisp Log Message: faster (simple-array (unsigned-byte 8) (*)) storing. Thanks to Chris Dean more lenient parsing of sbcl version. Thanks to Gustavo --- /project/cl-store/cvsroot/cl-store/ChangeLog 2007/01/26 15:02:24 1.48 +++ /project/cl-store/cvsroot/cl-store/ChangeLog 2007/09/17 18:40:02 1.49 @@ -1,3 +1,8 @@ +2007-09-17 Sean Ross <sross(a)common-lisp.net> + * sbcl/custom.lisp: be lenient when parsing parts of sbcls version string. Thanks to Gustavo. + * default-backend.lisp: faster serializing of (simple-array + unsigned-byte 8). Thanks to Chris Dean + 2007-01-26 Sean Ross <sross(a)common-lisp.net> * default-backend.lisp : Checked in a fix for non sb32 integers, certain large number numbers where incorrectly serialize. --- /project/cl-store/cvsroot/cl-store/cl-store.asd 2007/01/23 15:37:17 1.43 +++ /project/cl-store/cvsroot/cl-store/cl-store.asd 2007/09/17 18:40:02 1.44 @@ -20,7 +20,7 @@ (defun lisp-system-shortname () #+mcl :mcl #+lispworks :lispworks #+cmu :cmucl #+clisp :clisp #+sbcl :sbcl - #+allegro :acl #+ecl :ecl #+openmcl :openmcl #+abcl :abcl) + #+allegro :allegrocl #+ecl :ecl #+openmcl :openmcl #+abcl :abcl) (defmethod component-pathname ((component non-required-file)) (let ((pathname (call-next-method)) @@ -45,7 +45,7 @@ :name "CL-STORE" :author "Sean Ross <sross(a)common-lisp.net>" :maintainer "Sean Ross <sross(a)common-lisp.net>" - :version "0.7.9" + :version "0.7.12" :description "Serialization package" :long-description "Portable CL Package to serialize data" :licence "MIT" --- /project/cl-store/cvsroot/cl-store/default-backend.lisp 2007/01/26 15:02:24 1.39 +++ /project/cl-store/cvsroot/cl-store/default-backend.lisp 2007/09/17 18:40:02 1.40 @@ -43,6 +43,7 @@ (defparameter +array-code+ (register-code 19 'array)) (defparameter +simple-vector-code+ (register-code 20 'simple-vector)) (defparameter +package-code+ (register-code 21 'package)) +(defparameter +simple-byte-vector-code+ (register-code 22 'simple-byte-vector)) ;; fast storing for 32 bit ints (defparameter +32-bit-integer-code+ (register-code 24 '32-bit-integer)) @@ -220,7 +221,7 @@ (declare (optimize speed)) (block body (let (significand exponent sign) - (handler-bind (((or simple-error arithmetic-error) + (handler-bind (((or simple-error arithmetic-error type-error) #'(lambda (err) (declare (ignore err)) (when-let (type (cdr (assoc obj *special-floats*))) @@ -513,6 +514,7 @@ (simple-base-string (store-simple-base-string obj stream)) (simple-string (store-simple-string obj stream)) (simple-vector (store-simple-vector obj stream)) + ((simple-array (unsigned-byte 8) (*)) (store-simple-byte-vector obj stream)) (t (store-array obj stream)))) @@ -533,6 +535,9 @@ (loop for x from 0 below (array-total-size obj) do (store-object (row-major-aref obj x) stream))) + + + (defrestore-cl-store (array stream) (declare (optimize speed (safety 1) (debug 0))) (let* ((fill-pointer (restore-object stream)) @@ -576,6 +581,27 @@ (setting (aref obj x) (restore-object stream))))) res)) +(defun store-simple-byte-vector (obj stream) + (declare (optimize speed (safety 0) (debug 0)) + (type (simple-array (unsigned-byte 8) (*)) obj)) + (output-type-code +simple-byte-vector-code+ stream) + (store-object (length obj) stream) + (loop for x across obj do + (write-byte x stream))) + +(defrestore-cl-store (simple-byte-vector stream) + (declare (optimize speed (safety 1) (debug 0))) + (let* ((size (restore-object stream)) + (res (make-array size :element-type '(unsigned-byte 8)))) + (declare (type array-size size)) + (resolving-object (obj res) + (dotimes (i size) + ;; we need to copy the index so that + ;; it's value at this time is preserved. + (let ((x i)) + (setting (aref obj x) (read-byte stream))))) + res)) + ;; Dumping (unsigned-byte 32) for each character seems ;; like a bit much when most of them will be ;; base-chars. So we try to cater for them. --- /project/cl-store/cvsroot/cl-store/package.lisp 2007/01/26 15:02:24 1.27 +++ /project/cl-store/cvsroot/cl-store/package.lisp 2007/09/17 18:40:02 1.28 @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- ;; See the file LICENCE for licence information. -(in-package :cl-store.system) +;(in-package :cl-store.system) (defpackage #:cl-store (:use #:cl) --- /project/cl-store/cvsroot/cl-store/plumbing.lisp 2007/01/22 17:59:20 1.20 +++ /project/cl-store/cvsroot/cl-store/plumbing.lisp 2007/09/17 18:40:02 1.21 @@ -105,7 +105,6 @@ (:documentation "Store magic-number of BACKEND, when present, into STREAM.")) -(declaim (inline store-object)) (defun store-object (obj stream &optional (backend *current-backend*)) "Store OBJ into STREAM. Not meant to be overridden, use backend-store-object instead" @@ -204,10 +203,11 @@ ;; Wrapper for backend-restore-object so we don't have to pass ;; a backend object around all the time -(declaim (inline restore-object)) -(defun restore-object (place &optional (backend *current-backend*)) - "Restore the object in PLACE using BACKEND" - (backend-restore-object backend place)) + +(eval-when (:compile-toplevel :load-toplevel :execute) + (defun restore-object (place &optional (backend *current-backend*)) + "Restore the object in PLACE using BACKEND" + (backend-restore-object backend place))) (defgeneric backend-restore-object (backend place) (:documentation --- /project/cl-store/cvsroot/cl-store/tests.lisp 2007/01/26 15:02:25 1.32 +++ /project/cl-store/cvsroot/cl-store/tests.lisp 2007/09/17 18:40:03 1.33 @@ -126,6 +126,11 @@ (deftestit vector.6 #()) +;; (array octect (*)) + +(deftestit vector.octet.1 (make-array 10 :element-type '(unsigned-byte 8))) + + ;; arrays (deftestit array.1 (make-array '(2 2) :initial-contents '((1 2) (3 4)))) @@ -507,6 +512,7 @@ (eql (aref ret 1) (aref ret 2))))) t) + (defclass foo.1 () ((a :accessor foo1-a))) @@ -644,8 +650,6 @@ (f-x new-obj) (f-y new-obj) (f-z new-obj))))) (t t t 3 2 "Z")) - - (deftest serialization-unit.1 (with-serialization-unit () (with-open-file (outs *test-file* :element-type '(unsigned-byte 8) @@ -663,5 +667,7 @@ (when (probe-file *test-file*) (ignore-errors (delete-file *test-file*)))) +(run-tests 'cl-store:cl-store) + ;; EOF

1 0

[cl-store-cvs] CVS cl-store/acl
by sross 17 Sep '07

17 Sep '07

Update of /project/cl-store/cvsroot/cl-store/acl In directory clnet:/tmp/cvs-serv1189/acl Removed Files: custom.lisp Log Message: faster (simple-array (unsigned-byte 8) (*)) storing. Thanks to Chris Dean more lenient parsing of sbcl version. Thanks to Gustavo

1 0

[cl-store-cvs] CVS cl-store/allegrocl
by sross 17 Sep '07

17 Sep '07

Update of /project/cl-store/cvsroot/cl-store/allegrocl In directory clnet:/tmp/cvs-serv1114/allegrocl Log Message: Directory /project/cl-store/cvsroot/cl-store/allegrocl added to the repository

1 0

[cl-store-cvs] CVS cl-store
by sross 26 Jan '07

26 Jan '07

Update of /project/cl-store/cvsroot/cl-store In directory clnet:/tmp/cvs-serv25979 Modified Files: ChangeLog backends.lisp default-backend.lisp package.lisp tests.lisp Log Message: Changelog 2007-01-26 : Bug fix and alias-backend --- /project/cl-store/cvsroot/cl-store/ChangeLog 2007/01/23 15:37:17 1.47 +++ /project/cl-store/cvsroot/cl-store/ChangeLog 2007/01/26 15:02:24 1.48 @@ -1,3 +1,11 @@ +2007-01-26 Sean Ross <sross(a)common-lisp.net> + * default-backend.lisp : Checked in a fix for non sb32 integers, certain + large number numbers where incorrectly serialize. + Reported by Cyrus Harmon. + * plumbing.lisp: Added a new function alias-backend and alias the backend + 'cl-store:cl-store as :cl-store + + 2007-01-23 Sean Ross <sross(a)common-lisp.net> * circularities.lisp: Renamed with-grouped-serialization to with-serialization-unit and added two keyword args to allow removal of *grouped-restore-hash* and --- /project/cl-store/cvsroot/cl-store/backends.lisp 2006/12/14 18:15:41 1.14 +++ /project/cl-store/cvsroot/cl-store/backends.lisp 2007/01/26 15:02:24 1.15 @@ -111,6 +111,12 @@ (push (cons name instance) *registered-backends*)) instance)) +(defun alias-backend (old alias) + (let ((backend (find-backend old t))) + (pushnew (cons alias backend) *registered-backends* + :test #'equalp) + t)) + (defun get-class-form (name fields extends) `(defclass ,name ,extends ,fields --- /project/cl-store/cvsroot/cl-store/default-backend.lisp 2007/01/23 15:37:17 1.38 +++ /project/cl-store/cvsroot/cl-store/default-backend.lisp 2007/01/26 15:02:24 1.39 @@ -1,4 +1,4 @@ -;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- +7;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- ;; See the file LICENCE for licence information. ;; The cl-store backend. @@ -117,9 +117,9 @@ (defun dump-int (obj stream) (declare (optimize speed (safety 0) (debug 0))) - (typecase obj + (etypecase obj ((unsigned-byte 8) (write-byte 1 stream) (write-byte obj stream)) - (t (write-byte 2 stream) (store-32-bit obj stream)))) + ((unsigned-byte 32) (write-byte 2 stream) (store-32-bit obj stream)))) (defun undump-int (stream) (declare (optimize speed (safety 0) (debug 0))) @@ -138,34 +138,45 @@ (funcall (if (zerop (the fixnum (read-byte stream))) #'+ #'-) (undump-int stream))) + +(defun num->bits (num ) + (loop for val = (abs num) then (ash val -8 ) + for count from 0 + until (zerop val) + collect (logand val #XFF) into bits + finally (return (values bits count)))) + (defun store-arbitrary-integer (obj stream) (declare (type integer obj) (stream stream) (optimize speed)) (output-type-code +integer-code+ stream) - (loop for n = (abs obj) then (ash n -32) - for counter from 0 - with collect = nil - until (zerop n) - do (push n collect) - finally (progn - (store-object (if (minusp obj) - (- counter) - counter) - stream) - (dolist (num collect) - (dump-int num stream))))) + (multiple-value-bind (bits count) (num->bits obj) + (store-object (if (minusp obj) (- count) count) + stream) + (dolist (x bits) (store-32-bit x stream)))) + (defrestore-cl-store (integer buff) (declare (optimize speed)) - (let ((count (restore-object buff)) - (result 0)) - (declare (type integer result count)) - (loop repeat (abs count) do - (setf result (the integer (+ (ash result 32) - (the ub32 (undump-int buff)))))) - (if (minusp count) - (- result) - result))) + (let ((count (restore-object buff))) + (loop repeat (abs count) + with sum = 0 + for pos from 0 by 8 + for bit = (read-32-bit buff nil) + finally (return (if (minusp count) (- sum) sum)) + :do + (incf sum (* bit (expt 2 pos)))))) + + + +(defun bits->num (bits) + (loop with sum = 0 + for pos from 0 by 8 + for bit in bits + finally (return sum) + :do (incf sum (* bit (expt 2 pos))))) + + ;; Floats (*special-floats* are setup in the custom.lisp files) @@ -191,6 +202,7 @@ ;; function (defun create-float-values (value &rest codes) "Returns a alist of special float to float code mappings." + (declare (ignore value codes)) nil) (defun setup-special-floats () --- /project/cl-store/cvsroot/cl-store/package.lisp 2007/01/23 15:37:17 1.26 +++ /project/cl-store/cvsroot/cl-store/package.lisp 2007/01/26 15:02:24 1.27 @@ -29,7 +29,9 @@ ;; Hooks into lower level circularity tracking ;; to reduce consing. - #:with-serialization-unit #:create-serialize-hash) + #:with-serialization-unit #:create-serialize-hash + + #:alias-backend) #+sbcl (:import-from #:sb-mop #:generic-function-name --- /project/cl-store/cvsroot/cl-store/tests.lisp 2007/01/23 15:37:17 1.31 +++ /project/cl-store/cvsroot/cl-store/tests.lisp 2007/01/26 15:02:25 1.32 @@ -28,6 +28,7 @@ (deftestit integer.4 -2322993) (deftestit integer.5 most-positive-fixnum) (deftestit integer.6 most-negative-fixnum) +(deftestit integer.7 #x100000000) ;; ratios (deftestit ratio.1 1/2) @@ -44,8 +45,8 @@ (deftestit complex.5 #C(-111 -1123)) (deftestit complex.6 #C(-11.2 -34.5)) -;; short floats +;; short floats ;; single-float (deftestit single-float.1 3244.32) @@ -664,4 +665,3 @@ ;; EOF -

1 0

[cl-store-cvs] CVS cl-store
by sross 23 Jan '07

23 Jan '07

Update of /project/cl-store/cvsroot/cl-store In directory clnet:/tmp/cvs-serv5685 Modified Files: ChangeLog circularities.lisp cl-store.asd default-backend.lisp package.lisp tests.lisp Log Message: Changelog 2007-01-23 --- /project/cl-store/cvsroot/cl-store/ChangeLog 2007/01/22 17:59:20 1.46 +++ /project/cl-store/cvsroot/cl-store/ChangeLog 2007/01/23 15:37:17 1.47 @@ -1,3 +1,9 @@ +2007-01-23 Sean Ross <sross(a)common-lisp.net> + * circularities.lisp: Renamed with-grouped-serialization to with-serialization-unit + and added two keyword args to allow removal of *grouped-restore-hash* and + *grouped-store-hash* special vars as exported symbols. + * default-backend.lisp: Changed defvars of register-types to defparameters. + 2007-01-22 Sean Ross <sross(a)common-lisp.net> * utils.lisp, circularities.lisp, tests.lisp * stop store-32-bit from creating an intermediary object @@ -6,7 +12,7 @@ create-serialize-hash, with-grouped-serialization, *grouped-store-hash* and *grouped-restore-hash*. * conditionalize some forms which were preventing ABCL from running the tests. - * + 2006-12-16 Sean Ross <sross(a)common-lisp.net> * circularities.lisp: Bug fix from Alex Mizrahi. Change *restored-values* --- /project/cl-store/cvsroot/cl-store/circularities.lisp 2007/01/22 17:59:20 1.26 +++ /project/cl-store/cvsroot/cl-store/circularities.lisp 2007/01/23 15:37:17 1.27 @@ -105,9 +105,14 @@ (defun create-serialize-hash () (make-hash-table :test #'eql :size *store-hash-size*)) -(defmacro with-grouped-serialization (() &body body) - `(let ((*grouped-store-hash* (create-serialize-hash)) - (*grouped-restore-hash* (create-serialize-hash))) +(defmacro with-serialization-unit ((&key store-hash restore-hash) + &body body) + "Executes body in a single serialization unit allowing various internal data +structures to be reused. +The keys store-hash and restore-hash are expected to be either nil or +hash-tables as produced by the function create-serialize-hash." + `(let ((*grouped-store-hash* (or ,store-hash (create-serialize-hash))) + (*grouped-restore-hash* (or ,restore-hash (create-serialize-hash)))) ,@body)) (defun get-store-hash () --- /project/cl-store/cvsroot/cl-store/cl-store.asd 2006/12/16 13:55:00 1.42 +++ /project/cl-store/cvsroot/cl-store/cl-store.asd 2007/01/23 15:37:17 1.43 @@ -45,7 +45,7 @@ :name "CL-STORE" :author "Sean Ross <sross(a)common-lisp.net>" :maintainer "Sean Ross <sross(a)common-lisp.net>" - :version "0.7.6" + :version "0.7.9" :description "Serialization package" :long-description "Portable CL Package to serialize data" :licence "MIT" --- /project/cl-store/cvsroot/cl-store/default-backend.lisp 2006/12/14 18:15:41 1.37 +++ /project/cl-store/cvsroot/cl-store/default-backend.lisp 2007/01/23 15:37:17 1.38 @@ -22,42 +22,42 @@ ;; Type code constants -(defvar +referrer-code+ (register-code 1 'referrer)) -(defvar +special-float-code+ (register-code 2 'special-float)) -(defvar +unicode-string-code+ (register-code 3 'unicode-string)) -(defvar +integer-code+ (register-code 4 'integer)) -(defvar +simple-string-code+ (register-code 5 'simple-string)) -(defvar +float-code+ (register-code 6 'float)) -(defvar +ratio-code+ (register-code 7 'ratio)) -(defvar +character-code+ (register-code 8 'character)) -(defvar +complex-code+ (register-code 9 'complex)) -(defvar +symbol-code+ (register-code 10 'symbol)) -(defvar +cons-code+ (register-code 11 'cons)) -(defvar +pathname-code+ (register-code 12 'pathname)) -(defvar +hash-table-code+ (register-code 13 'hash-table)) -(defvar +standard-object-code+ (register-code 14 'standard-object)) -(defvar +condition-code+ (register-code 15 'condition)) -(defvar +structure-object-code+ (register-code 16 'structure-object)) -(defvar +standard-class-code+ (register-code 17 'standard-class)) -(defvar +built-in-class-code+ (register-code 18 'built-in-class)) -(defvar +array-code+ (register-code 19 'array)) -(defvar +simple-vector-code+ (register-code 20 'simple-vector)) -(defvar +package-code+ (register-code 21 'package)) +(defparameter +referrer-code+ (register-code 1 'referrer)) +(defparameter +special-float-code+ (register-code 2 'special-float)) +(defparameter +unicode-string-code+ (register-code 3 'unicode-string)) +(defparameter +integer-code+ (register-code 4 'integer)) +(defparameter +simple-string-code+ (register-code 5 'simple-string)) +(defparameter +float-code+ (register-code 6 'float)) +(defparameter +ratio-code+ (register-code 7 'ratio)) +(defparameter +character-code+ (register-code 8 'character)) +(defparameter +complex-code+ (register-code 9 'complex)) +(defparameter +symbol-code+ (register-code 10 'symbol)) +(defparameter +cons-code+ (register-code 11 'cons)) +(defparameter +pathname-code+ (register-code 12 'pathname)) +(defparameter +hash-table-code+ (register-code 13 'hash-table)) +(defparameter +standard-object-code+ (register-code 14 'standard-object)) +(defparameter +condition-code+ (register-code 15 'condition)) +(defparameter +structure-object-code+ (register-code 16 'structure-object)) +(defparameter +standard-class-code+ (register-code 17 'standard-class)) +(defparameter +built-in-class-code+ (register-code 18 'built-in-class)) +(defparameter +array-code+ (register-code 19 'array)) +(defparameter +simple-vector-code+ (register-code 20 'simple-vector)) +(defparameter +package-code+ (register-code 21 'package)) ;; fast storing for 32 bit ints -(defvar +32-bit-integer-code+ (register-code 24 '32-bit-integer nil)) +(defparameter +32-bit-integer-code+ (register-code 24 '32-bit-integer)) -(defvar +function-code+ (register-code 26 'function nil)) -(defvar +gf-code+ (register-code 27 'generic-function nil)) +(defparameter +function-code+ (register-code 26 'function nil)) +(defparameter +gf-code+ (register-code 27 'generic-function nil)) ;; Used by SBCL and CMUCL. -(defvar +structure-class-code+ (register-code 28 'structure-class nil)) -(defvar +struct-def-code+ (register-code 29 'struct-def nil)) +(defparameter +structure-class-code+ (register-code 28 'structure-class nil)) +(defparameter +struct-def-code+ (register-code 29 'struct-def nil)) -(defvar +gensym-code+ (register-code 30 'gensym nil)) +(defparameter +gensym-code+ (register-code 30 'gensym nil)) -(defvar +unicode-base-string-code+ (register-code 34 'unicode-base-string nil)) -(defvar +simple-base-string-code+ (register-code 35 'simple-base-string nil)) +(defparameter +unicode-base-string-code+ (register-code 34 'unicode-base-string nil)) +(defparameter +simple-base-string-code+ (register-code 35 'simple-base-string nil)) ;; setups for type code mapping (defun output-type-code (code stream) @@ -216,7 +216,7 @@ (write-byte type stream) (return-from body))))) (multiple-value-setq (significand exponent sign) - (integer-decode-float obj)) + (integer-decode-float obj)) (output-type-code +float-code+ stream) (write-byte (float-type obj) stream) (store-object significand stream) --- /project/cl-store/cvsroot/cl-store/package.lisp 2007/01/22 17:59:20 1.25 +++ /project/cl-store/cvsroot/cl-store/package.lisp 2007/01/23 15:37:17 1.26 @@ -29,8 +29,7 @@ ;; Hooks into lower level circularity tracking ;; to reduce consing. - #:with-grouped-serialization #:create-serialize-hash - #:*grouped-store-hash* #:*grouped-restore-hash*) + #:with-serialization-unit #:create-serialize-hash) #+sbcl (:import-from #:sb-mop #:generic-function-name --- /project/cl-store/cvsroot/cl-store/tests.lisp 2007/01/22 17:59:20 1.30 +++ /project/cl-store/cvsroot/cl-store/tests.lisp 2007/01/23 15:37:17 1.31 @@ -573,7 +573,7 @@ ;; custom storing (defclass random-obj () ((size :accessor size :initarg :size))) -(defvar *random-obj-code* (register-code 100 'random-obj)) +(defparameter *random-obj-code* (register-code 100 'random-obj)) (defstore-cl-store (obj random-obj buff) (output-type-code *random-obj-code* buff) @@ -645,8 +645,8 @@ -(deftest grouped-serialization - (with-grouped-serialization () +(deftest serialization-unit.1 + (with-serialization-unit () (with-open-file (outs *test-file* :element-type '(unsigned-byte 8) :if-exists :supersede :direction :output) (dotimes (x 100)

1 0

[cl-store-cvs] CVS cl-store
by sross 22 Jan '07

22 Jan '07

Update of /project/cl-store/cvsroot/cl-store In directory clnet:/tmp/cvs-serv13298 Modified Files: ChangeLog circularities.lisp package.lisp plumbing.lisp tests.lisp utils.lisp Log Message: Changelog 2007-01-22 --- /project/cl-store/cvsroot/cl-store/ChangeLog 2006/12/17 00:11:09 1.45 +++ /project/cl-store/cvsroot/cl-store/ChangeLog 2007/01/22 17:59:20 1.46 @@ -1,3 +1,13 @@ +2007-01-22 Sean Ross <sross(a)common-lisp.net> + * utils.lisp, circularities.lisp, tests.lisp + * stop store-32-bit from creating an intermediary object + which reduces the consing (on at least Lispworks 5.0 and SBCL 'Kitten of Death'). + * export 4 new symbols which allows more efficient serialization of values. + create-serialize-hash, with-grouped-serialization, *grouped-store-hash* + and *grouped-restore-hash*. + * conditionalize some forms which were preventing ABCL from running the tests. + * + 2006-12-16 Sean Ross <sross(a)common-lisp.net> * circularities.lisp: Bug fix from Alex Mizrahi. Change *restored-values* to use eql as the hash test. --- /project/cl-store/cvsroot/cl-store/circularities.lisp 2006/12/17 00:11:09 1.25 +++ /project/cl-store/cvsroot/cl-store/circularities.lisp 2007/01/22 17:59:20 1.26 @@ -99,13 +99,37 @@ (defvar *store-hash-size* 50) +(defvar *grouped-store-hash*) +(defvar *grouped-restore-hash*) + +(defun create-serialize-hash () + (make-hash-table :test #'eql :size *store-hash-size*)) + +(defmacro with-grouped-serialization (() &body body) + `(let ((*grouped-store-hash* (create-serialize-hash)) + (*grouped-restore-hash* (create-serialize-hash))) + ,@body)) + +(defun get-store-hash () + (when *check-for-circs* + (if (boundp '*grouped-store-hash*) + (clrhash *grouped-store-hash*) + (create-serialize-hash)))) + +(defun get-restore-hash () + (when *check-for-circs* + (if (boundp '*grouped-restore-hash*) + (clrhash *grouped-restore-hash*) + (create-serialize-hash)))) + +(defmethod backend-store :around ((backend resolving-backend) (place t) (obj t)) + (call-next-method)) (defmethod backend-store ((backend resolving-backend) (place stream) (obj t)) "Store OBJ into PLACE. Does the setup for counters and seen values." (declare (optimize speed (safety 1) (debug 0))) (let ((*stored-counter* 0) - (*stored-values* (and *check-for-circs* - (make-hash-table :test #'eq :size *store-hash-size*)))) + (*stored-values* (get-store-hash))) (store-backend-code backend place) (backend-store-object backend obj place) obj)) @@ -166,9 +190,7 @@ various variables used by resolving-object." (let ((*restore-counter* 0) (*need-to-fix* nil) - (*restored-values* (and *check-for-circs* - (make-hash-table :test #'eql - :size *restore-hash-size*)))) + (*restored-values* (get-restore-hash))) (check-magic-number backend place) (prog1 (backend-restore-object backend place) --- /project/cl-store/cvsroot/cl-store/package.lisp 2006/08/03 19:42:09 1.24 +++ /project/cl-store/cvsroot/cl-store/package.lisp 2007/01/22 17:59:20 1.25 @@ -25,7 +25,12 @@ #:store-32-bit #:read-32-bit #:*check-for-circs* #:*store-hash-size* #:*restore-hash-size* #:get-slot-details #:*store-used-packages* #:*nuke-existing-packages* - #:serializable-slots-using-class) + #:serializable-slots-using-class + + ;; Hooks into lower level circularity tracking + ;; to reduce consing. + #:with-grouped-serialization #:create-serialize-hash + #:*grouped-store-hash* #:*grouped-restore-hash*) #+sbcl (:import-from #:sb-mop #:generic-function-name @@ -53,7 +58,7 @@ #:class-direct-superclasses #:class-slots #:ensure-class) - + #+cmu (:import-from #:pcl #:generic-function-name #:slot-definition-name --- /project/cl-store/cvsroot/cl-store/plumbing.lisp 2005/11/30 09:49:56 1.19 +++ /project/cl-store/cvsroot/cl-store/plumbing.lisp 2007/01/22 17:59:20 1.20 @@ -102,7 +102,7 @@ (declare (optimize speed)) (when-let (magic (magic-number backend)) (store-32-bit magic stream))) - (:documentation + (:documentation "Store magic-number of BACKEND, when present, into STREAM.")) (declaim (inline store-object)) --- /project/cl-store/cvsroot/cl-store/tests.lisp 2006/12/14 18:15:41 1.29 +++ /project/cl-store/cvsroot/cl-store/tests.lisp 2007/01/22 17:59:20 1.30 @@ -522,7 +522,7 @@ (foo1-a (foo1-a (foo1-a ret))))))) t) - +#-abcl (deftest circ.14 (let ((list '#1=(1 2 3 #1# . #1#))) (store list *test-file*) (let ((ret (restore *test-file*))) @@ -533,6 +533,7 @@ +#-abcl (deftest circ.15 (let ((list '#1=(1 2 3 #2=(#2#) . #1#))) (store list *test-file*) (let ((ret (restore *test-file*))) @@ -546,6 +547,7 @@ ;; this had me confused for a while since what was ;; restored #1=(1 (#1#) #1#) looks nothing like this list, ;; but it turns out that it is correct +#-abcl (deftest circ.16 (let ((list '#1=(1 #2=(#1#) . #2#))) (store list *test-file*) (let ((ret (restore *test-file*))) @@ -641,6 +643,19 @@ (f-x new-obj) (f-y new-obj) (f-z new-obj))))) (t t t 3 2 "Z")) + + +(deftest grouped-serialization + (with-grouped-serialization () + (with-open-file (outs *test-file* :element-type '(unsigned-byte 8) + :if-exists :supersede :direction :output) + (dotimes (x 100) + (cl-store:store x outs))) + (with-open-file (outs *test-file* :element-type '(unsigned-byte 8) + :if-exists :supersede) + (loop :repeat 100 :collect (cl-store:restore outs)))) + #.(loop :for x :below 100 :collect x)) + (defun run-tests (backend) (with-backend backend (regression-test:do-tests)) --- /project/cl-store/cvsroot/cl-store/utils.lisp 2006/12/16 13:50:26 1.25 +++ /project/cl-store/cvsroot/cl-store/utils.lisp 2007/01/22 17:59:20 1.26 @@ -12,7 +12,6 @@ `(let ,(mapcar #'(lambda (x) `(,x (gensym))) names) ,@body)) -#-abcl (defgeneric serializable-slots (object) (declare (optimize speed)) (:documentation @@ -29,7 +28,7 @@ ; unfortunately the metaclass of conditions in sbcl and cmu ; are not standard-class -#-abcl + (defgeneric serializable-slots-using-class (object class) (declare (optimize speed)) (:documentation "Return a list of slot-definitions to serialize. @@ -110,18 +109,15 @@ (deftype array-tot-size () "The maximum total size of an array" `(integer 0 , array-total-size-limit)) - - (defun store-32-bit (obj stream) "Write OBJ down STREAM as a 32 bit integer." (declare (optimize speed (debug 0) (safety 0)) - (type sb32 obj)) - (let ((obj (logand #XFFFFFFFF obj))) + (type ub32 obj)) (write-byte (ldb (byte 8 0) obj) stream) (write-byte (ldb (byte 8 8) obj) stream) (write-byte (ldb (byte 8 16) obj) stream) - (write-byte (+ 0 (ldb (byte 8 24) obj)) stream))) + (write-byte (+ 0 (ldb (byte 8 24) obj)) stream)) (defmacro make-ub32 (a b c d) `(the ub32 (logior (ash ,a 24) (ash ,b 16) (ash ,c 8) ,d)))

1 0

[cl-store-cvs] CVS cl-store
by sross 17 Dec '06

17 Dec '06

Update of /project/cl-store/cvsroot/cl-store In directory clnet:/tmp/cvs-serv19024 Modified Files: circularities.lisp ChangeLog Log Message: Bug fix from Alex Mizrahi. Change *restored-values* to use eql as the hash test. --- /project/cl-store/cvsroot/cl-store/circularities.lisp 2005/10/04 08:10:26 1.24 +++ /project/cl-store/cvsroot/cl-store/circularities.lisp 2006/12/17 00:11:09 1.25 @@ -167,7 +167,7 @@ (let ((*restore-counter* 0) (*need-to-fix* nil) (*restored-values* (and *check-for-circs* - (make-hash-table :test #'eq + (make-hash-table :test #'eql :size *restore-hash-size*)))) (check-magic-number backend place) (prog1 @@ -225,9 +225,9 @@ (declare (optimize speed (safety 1) (debug 0))) (if (referrer-p val) (multiple-value-bind (new-val win) (referred-value val *restored-values*) - (if (or new-val win) - new-val - val)) + (if (or new-val win) + new-val + val)) val)) ;; EOF --- /project/cl-store/cvsroot/cl-store/ChangeLog 2006/12/16 13:50:26 1.44 +++ /project/cl-store/cvsroot/cl-store/ChangeLog 2006/12/17 00:11:09 1.45 @@ -1,4 +1,8 @@ 2006-12-16 Sean Ross <sross(a)common-lisp.net> + * circularities.lisp: Bug fix from Alex Mizrahi. Change *restored-values* + to use eql as the hash test. + +2006-12-16 Sean Ross <sross(a)common-lisp.net> * cl-store.asd, utils.lisp : Added preliminary support for ABCL (tested on version 0.0.9).

1 0

[cl-store-cvs] CVS cl-store
by sross 16 Dec '06

16 Dec '06

Update of /project/cl-store/cvsroot/cl-store In directory clnet:/tmp/cvs-serv3961 Modified Files: cl-store.asd Log Message: Bumped version to 0.7.6 --- /project/cl-store/cvsroot/cl-store/cl-store.asd 2006/12/16 13:50:26 1.41 +++ /project/cl-store/cvsroot/cl-store/cl-store.asd 2006/12/16 13:55:00 1.42 @@ -45,7 +45,7 @@ :name "CL-STORE" :author "Sean Ross <sross(a)common-lisp.net>" :maintainer "Sean Ross <sross(a)common-lisp.net>" - :version "0.7.5" + :version "0.7.6" :description "Serialization package" :long-description "Portable CL Package to serialize data" :licence "MIT"

1 0

[cl-store-cvs] CVS cl-store
by sross 16 Dec '06

16 Dec '06

Update of /project/cl-store/cvsroot/cl-store In directory clnet:/tmp/cvs-serv3655 Modified Files: .cvsignore ChangeLog cl-store.asd utils.lisp Log Message: Changelog 2006-12-16 : Preliminary Support for ABCL --- /project/cl-store/cvsroot/cl-store/.cvsignore 2006/12/11 21:44:02 1.4 +++ /project/cl-store/cvsroot/cl-store/.cvsignore 2006/12/16 13:50:26 1.5 @@ -9,3 +9,4 @@ *.fsl *.ofasl *.ufasl +*.abcl --- /project/cl-store/cvsroot/cl-store/ChangeLog 2006/12/14 18:15:41 1.43 +++ /project/cl-store/cvsroot/cl-store/ChangeLog 2006/12/16 13:50:26 1.44 @@ -1,3 +1,7 @@ +2006-12-16 Sean Ross <sross(a)common-lisp.net> + * cl-store.asd, utils.lisp : Added preliminary support for ABCL (tested on + version 0.0.9). + 2006-12-13 Sean Ross <sross(a)common-lisp.net> * utils.lisp, acl/custom.lisp, cmucl/custom.lisp, lispworks/custom.lisp sbcl/custom/lisp, default-backend.lisp, cl-store.asd: --- /project/cl-store/cvsroot/cl-store/cl-store.asd 2006/12/14 18:15:41 1.40 +++ /project/cl-store/cvsroot/cl-store/cl-store.asd 2006/12/16 13:50:26 1.41 @@ -9,7 +9,7 @@ (in-package #:cl-store.system) -#-(or lispworks mcl cmu clisp sbcl allegro ecl openmcl) +#-(or lispworks mcl cmu clisp sbcl allegro ecl openmcl abcl) (error "This is an unsupported lisp implementation. Currently only MCL, OpenMCL, Lispworks, CMUCL, SBCL, CLISP, ECL and AllegroCL are supported.") @@ -20,7 +20,7 @@ (defun lisp-system-shortname () #+mcl :mcl #+lispworks :lispworks #+cmu :cmucl #+clisp :clisp #+sbcl :sbcl - #+allegro :acl #+ecl :ecl #+openmcl :openmcl) + #+allegro :acl #+ecl :ecl #+openmcl :openmcl #+abcl :abcl) (defmethod component-pathname ((component non-required-file)) (let ((pathname (call-next-method)) --- /project/cl-store/cvsroot/cl-store/utils.lisp 2006/12/14 18:15:41 1.24 +++ /project/cl-store/cvsroot/cl-store/utils.lisp 2006/12/16 13:50:26 1.25 @@ -12,6 +12,7 @@ `(let ,(mapcar #'(lambda (x) `(,x (gensym))) names) ,@body)) +#-abcl (defgeneric serializable-slots (object) (declare (optimize speed)) (:documentation @@ -28,6 +29,7 @@ ; unfortunately the metaclass of conditions in sbcl and cmu ; are not standard-class +#-abcl (defgeneric serializable-slots-using-class (object class) (declare (optimize speed)) (:documentation "Return a list of slot-definitions to serialize. @@ -46,6 +48,7 @@ ; Generify get-slot-details for customization (from Thomas Stenhaug) +#-abcl (defgeneric get-slot-details (slot-definition) (declare (optimize speed)) (:documentation

1 0

[cl-store-cvs] CVS cl-store/cmucl
by sross 14 Dec '06

14 Dec '06

Update of /project/cl-store/cvsroot/cl-store/cmucl In directory clnet:/tmp/cvs-serv7536/cmucl Modified Files: custom.lisp Log Message: Changelog 2006-12-13 --- /project/cl-store/cvsroot/cl-store/cmucl/custom.lisp 2005/02/11 12:00:39 1.6 +++ /project/cl-store/cvsroot/cl-store/cmucl/custom.lisp 2006/12/14 18:15:43 1.7 @@ -3,31 +3,16 @@ (in-package :cl-store) -(defvar +single-positive-infinity+ most-positive-single-float) -(defvar +single-negative-infinity+ most-negative-single-float) -(defvar +single-nan+) - -(defvar +double-positive-infinity+ most-positive-double-float) -(defvar +double-negative-infinity+ most-negative-double-float) -(defvar +double-nan+) - -(ext:with-float-traps-masked (:overflow :invalid) - (setf +single-positive-infinity+ (expt +single-positive-infinity+ 2)) - (setf +single-negative-infinity+ (expt +single-negative-infinity+ 3)) - (setf +single-nan+ (/ +single-negative-infinity+ +single-negative-infinity+)) - (setf +double-positive-infinity+ (expt +double-positive-infinity+ 2)) - (setf +double-negative-infinity+ (expt +double-negative-infinity+ 3)) - (setf +double-nan+ (/ +double-negative-infinity+ +double-negative-infinity+))) - -(setf *special-floats* - (list (cons +double-positive-infinity+ +positive-double-infinity-code+) - (cons +single-positive-infinity+ +positive-infinity-code+) - (cons +single-negative-infinity+ +negative-infinity-code+) - (cons +double-negative-infinity+ +negative-double-infinity-code+) - (cons +single-nan+ +float-nan-code+) - (cons +double-nan+ +float-double-nan-code+))) - - +; special floats +(defun create-float-values (value &rest codes) + "Returns a alist of special float to float code mappings." + (ext:with-float-traps-masked (:overflow :invalid) + (let ((neg-inf (expt value 3))) + (mapcar 'cons + (list (expt (abs value) 2) + neg-inf + (/ neg-inf neg-inf)) + codes)))) ;; Custom Structures (defstore-cl-store (obj structure-object stream)

1 0

[cl-store-cvs] CVS cl-store/lispworks
by sross 14 Dec '06

14 Dec '06

Update of /project/cl-store/cvsroot/cl-store/lispworks In directory clnet:/tmp/cvs-serv7536/lispworks Modified Files: custom.lisp Log Message: Changelog 2006-12-13 --- /project/cl-store/cvsroot/cl-store/lispworks/custom.lisp 2006/12/11 21:44:03 1.8 +++ /project/cl-store/cvsroot/cl-store/lispworks/custom.lisp 2006/12/14 18:15:43 1.9 @@ -3,7 +3,7 @@ (in-package :cl-store) -;; Setup special floats +;; Special float handling (defun create-float-values (value &rest codes) (let ((neg-inf (expt value 3))) (mapcar 'cons @@ -12,12 +12,6 @@ (/ neg-inf neg-inf)) codes))) -(defparameter *special-floats* - (nconc (create-float-values most-negative-single-float +positive-infinity-code+ - +negative-infinity-code+ +float-nan-code+) - (create-float-values most-negative-double-float +positive-double-infinity-code+ - +negative-double-infinity-code+ +float-double-nan-code+))) - ;; Custom structure storing from Alain Picard. (defstore-cl-store (obj structure-object stream) (output-type-code +structure-object-code+ stream)

1 0

[cl-store-cvs] CVS cl-store/sbcl
by sross 14 Dec '06

14 Dec '06

Update of /project/cl-store/cvsroot/cl-store/sbcl In directory clnet:/tmp/cvs-serv7536/sbcl Modified Files: custom.lisp Log Message: Changelog 2006-12-13 --- /project/cl-store/cvsroot/cl-store/sbcl/custom.lisp 2006/03/14 11:02:32 1.12 +++ /project/cl-store/cvsroot/cl-store/sbcl/custom.lisp 2006/12/14 18:15:43 1.13 @@ -4,31 +4,15 @@ (in-package :cl-store) ; special floats -(defvar +single-positive-infinity+ most-positive-single-float) -(defvar +single-negative-infinity+ most-negative-single-float) -(defvar +single-nan+) - -(defvar +double-positive-infinity+ most-positive-double-float) -(defvar +double-negative-infinity+ most-negative-double-float) -(defvar +double-nan+) - -(sb-int:with-float-traps-masked (:overflow :invalid) - (setf +single-positive-infinity+ (expt +single-positive-infinity+ 2)) - (setf +single-negative-infinity+ (expt +single-negative-infinity+ 3)) - (setf +single-nan+ (/ +single-negative-infinity+ +single-negative-infinity+)) - (setf +double-positive-infinity+ (expt +double-positive-infinity+ 2)) - (setf +double-negative-infinity+ (expt +double-negative-infinity+ 3)) - (setf +double-nan+ (/ +double-negative-infinity+ +double-negative-infinity+))) - -(setf *special-floats* - (list (cons +double-positive-infinity+ +positive-double-infinity-code+) - (cons +single-positive-infinity+ +positive-infinity-code+) - (cons +single-negative-infinity+ +negative-infinity-code+) - (cons +double-negative-infinity+ +negative-double-infinity-code+) - (cons +single-nan+ +float-nan-code+) - (cons +double-nan+ +float-double-nan-code+))) - - +(defun create-float-values (value &rest codes) + "Returns a alist of special float to float code mappings." + (sb-int:with-float-traps-masked (:overflow :invalid) + (let ((neg-inf (expt value 3))) + (mapcar 'cons + (list (expt (abs value) 2) + neg-inf + (/ neg-inf neg-inf)) + codes)))) ;; Custom structure storing

1 0

[cl-store-cvs] CVS cl-store/acl
by sross 14 Dec '06

14 Dec '06

Update of /project/cl-store/cvsroot/cl-store/acl In directory clnet:/tmp/cvs-serv7536/acl Modified Files: custom.lisp Log Message: Changelog 2006-12-13 --- /project/cl-store/cvsroot/cl-store/acl/custom.lisp 2005/02/11 12:00:35 1.3 +++ /project/cl-store/cvsroot/cl-store/acl/custom.lisp 2006/12/14 18:15:41 1.4 @@ -4,24 +4,12 @@ (in-package :cl-store) -;; setup special floats -(defvar +single-positive-infinity+ (expt most-positive-single-float 2)) -(defvar +single-negative-infinity+ (expt most-negative-single-float 3)) -(defvar +single-nan+ (/ +single-negative-infinity+ +single-negative-infinity+)) - -(defvar +double-positive-infinity+ (expt most-positive-double-float 2)) -(defvar +double-negative-infinity+ (expt most-negative-double-float 3)) -(defvar +double-nan+ (/ +double-negative-infinity+ +double-negative-infinity+)) - - -(setf *special-floats* - (list (cons +double-positive-infinity+ +positive-double-infinity-code+) - (cons +single-positive-infinity+ +positive-infinity-code+) - (cons +single-negative-infinity+ +negative-infinity-code+) - (cons +double-negative-infinity+ +negative-double-infinity-code+) - (cons +single-nan+ +float-nan-code+) - (cons +double-nan+ +float-double-nan-code+))) - - +(defun create-float-values (value &rest codes) + (let ((neg-inf (expt value 3))) + (mapcar 'cons + (list (expt (abs value) 2) + neg-inf + (/ neg-inf neg-inf)) + codes))) ;; EOF

1 0

[cl-store-cvs] CVS cl-store
by sross 14 Dec '06

14 Dec '06

Update of /project/cl-store/cvsroot/cl-store In directory clnet:/tmp/cvs-serv7536 Modified Files: ChangeLog backends.lisp cl-store.asd default-backend.lisp tests.lisp utils.lisp Log Message: Changelog 2006-12-13 --- /project/cl-store/cvsroot/cl-store/ChangeLog 2006/12/11 21:44:02 1.42 +++ /project/cl-store/cvsroot/cl-store/ChangeLog 2006/12/14 18:15:41 1.43 @@ -1,3 +1,10 @@ +2006-12-13 Sean Ross <sross(a)common-lisp.net> + * utils.lisp, acl/custom.lisp, cmucl/custom.lisp, lispworks/custom.lisp + sbcl/custom/lisp, default-backend.lisp, cl-store.asd: + Committed handling for serialization of float types short, single, double and + long and handling of positive infinity, negative infinity and NaN for all + float types (this is still only for sbcl, cmucl, acl, and lispworks). + 2006-12-11 Sean Ross <sross(a)common-lisp.net> * lispworks/custom.lisp: Began work on new special float creation. * .cvsignore : Update ignorable files --- /project/cl-store/cvsroot/cl-store/backends.lisp 2005/11/30 09:49:56 1.13 +++ /project/cl-store/cvsroot/cl-store/backends.lisp 2006/12/14 18:15:41 1.14 @@ -111,7 +111,6 @@ (push (cons name instance) *registered-backends*)) instance)) - (defun get-class-form (name fields extends) `(defclass ,name ,extends ,fields --- /project/cl-store/cvsroot/cl-store/cl-store.asd 2006/12/11 21:44:02 1.39 +++ /project/cl-store/cvsroot/cl-store/cl-store.asd 2006/12/14 18:15:41 1.40 @@ -45,7 +45,7 @@ :name "CL-STORE" :author "Sean Ross <sross(a)common-lisp.net>" :maintainer "Sean Ross <sross(a)common-lisp.net>" - :version "0.7.3" + :version "0.7.5" :description "Serialization package" :long-description "Portable CL Package to serialize data" :licence "MIT" @@ -61,6 +61,7 @@ (:non-required-file "custom"))) (defmethod perform :after ((o load-op) (c (eql (find-system :cl-store)))) + (funcall (find-symbol "SETUP-SPECIAL-FLOATS" :cl-store)) (provide 'cl-store)) (defmethod perform ((op test-op) (sys (eql (find-system :cl-store)))) --- /project/cl-store/cvsroot/cl-store/default-backend.lisp 2006/12/11 21:44:02 1.36 +++ /project/cl-store/cvsroot/cl-store/default-backend.lisp 2006/12/14 18:15:41 1.37 @@ -4,17 +4,16 @@ ;; The cl-store backend. (in-package :cl-store) -(defbackend cl-store :magic-number 1416850499 +(defbackend cl-store :magic-number 1395477571 :stream-type '(unsigned-byte 8) :old-magic-numbers (1912923 1886611788 1347635532 1886611820 1414745155 - 1349740876 1884506444 1347643724 1349732684 1953713219) + 1349740876 1884506444 1347643724 1349732684 1953713219 + 1416850499) :extends (resolving-backend) :fields ((restorers :accessor restorers :initform (make-hash-table :size 100)))) - - -(defun register-code (code name &optional (errorp t)) +(defun register-code (code name &optional (errorp nil)) (aif (and (gethash code (restorers (find-backend 'cl-store))) errorp) (error "Code ~A is already defined for ~A." code name) (setf (gethash code (restorers (find-backend 'cl-store))) @@ -23,35 +22,31 @@ ;; Type code constants -(defvar +referrer-code+ (register-code 1 'referrer nil)) -(defvar +unicode-string-code+ (register-code 3 'unicode-string nil)) -(defvar +integer-code+ (register-code 4 'integer nil)) -(defvar +simple-string-code+ (register-code 5 'simple-string nil)) -(defvar +float-code+ (register-code 6 'float nil)) -(defvar +ratio-code+ (register-code 7 'ratio nil)) -(defvar +character-code+ (register-code 8 'character nil)) -(defvar +complex-code+ (register-code 9 'complex nil)) -(defvar +symbol-code+ (register-code 10 'symbol nil)) -(defvar +cons-code+ (register-code 11 'cons nil)) -(defvar +pathname-code+ (register-code 12 'pathname nil)) -(defvar +hash-table-code+ (register-code 13 'hash-table nil)) -(defvar +standard-object-code+ (register-code 14 'standard-object nil)) -(defvar +condition-code+ (register-code 15 'condition nil)) -(defvar +structure-object-code+ (register-code 16 'structure-object nil)) -(defvar +standard-class-code+ (register-code 17 'standard-class nil)) -(defvar +built-in-class-code+ (register-code 18 'built-in-class nil)) -(defvar +array-code+ (register-code 19 'array nil)) -(defvar +simple-vector-code+ (register-code 20 'simple-vector nil)) -(defvar +package-code+ (register-code 21 'package nil)) - -(defvar +positive-infinity-code+ (register-code 22 'positive-infinity nil)) -(defvar +negative-infinity-code+ (register-code 23 'negative-infinity nil)) +(defvar +referrer-code+ (register-code 1 'referrer)) +(defvar +special-float-code+ (register-code 2 'special-float)) +(defvar +unicode-string-code+ (register-code 3 'unicode-string)) +(defvar +integer-code+ (register-code 4 'integer)) +(defvar +simple-string-code+ (register-code 5 'simple-string)) +(defvar +float-code+ (register-code 6 'float)) +(defvar +ratio-code+ (register-code 7 'ratio)) +(defvar +character-code+ (register-code 8 'character)) +(defvar +complex-code+ (register-code 9 'complex)) +(defvar +symbol-code+ (register-code 10 'symbol)) +(defvar +cons-code+ (register-code 11 'cons)) +(defvar +pathname-code+ (register-code 12 'pathname)) +(defvar +hash-table-code+ (register-code 13 'hash-table)) +(defvar +standard-object-code+ (register-code 14 'standard-object)) +(defvar +condition-code+ (register-code 15 'condition)) +(defvar +structure-object-code+ (register-code 16 'structure-object)) +(defvar +standard-class-code+ (register-code 17 'standard-class)) +(defvar +built-in-class-code+ (register-code 18 'built-in-class)) +(defvar +array-code+ (register-code 19 'array)) +(defvar +simple-vector-code+ (register-code 20 'simple-vector)) +(defvar +package-code+ (register-code 21 'package)) -;; new storing for 32 bit ints +;; fast storing for 32 bit ints (defvar +32-bit-integer-code+ (register-code 24 '32-bit-integer nil)) -(defvar +float-nan-code+ (register-code 25 'nan-float nil)) - (defvar +function-code+ (register-code 26 'function nil)) (defvar +gf-code+ (register-code 27 'generic-function nil)) @@ -61,13 +56,9 @@ (defvar +gensym-code+ (register-code 30 'gensym nil)) -(defvar +positive-double-infinity-code+ (register-code 31 'positive-double-infinity nil)) -(defvar +negative-double-infinity-code+ (register-code 32 'negative-double-infinity nil)) -(defvar +float-double-nan-code+ (register-code 33 'float-double-nan nil)) (defvar +unicode-base-string-code+ (register-code 34 'unicode-base-string nil)) (defvar +simple-base-string-code+ (register-code 35 'simple-base-string nil)) - ;; setups for type code mapping (defun output-type-code (code stream) (declare (type ub32 code)) @@ -81,7 +72,7 @@ (declare (optimize speed (safety 0) (space 0) (debug 0))) (eql reader 'referrer)) -(defvar *restorers* (restorers (find-backend 'cl-store))) +(defparameter *restorers* (restorers (find-backend 'cl-store))) ;; get-next-reader needs to return a symbol which will be used by the ;; backend to lookup the function that was defined by @@ -118,8 +109,6 @@ (eql type 'integer) (eql type 'character))) -; (find type '(integer character 32-bit-integer))) - (defstore-cl-store (obj integer stream) (declare (optimize speed (safety 1) (debug 0))) (if (typep obj 'sb32) @@ -179,8 +168,42 @@ result))) ;; Floats (*special-floats* are setup in the custom.lisp files) + +(defconstant +short-float-inf+ 0) +(defconstant +short-float-neg-inf+ 1) +(defconstant +short-float-nan+ 2) + +(defconstant +single-float-inf+ 3) +(defconstant +single-float-neg-inf+ 4) +(defconstant +single-float-nan+ 5) + +(defconstant +double-float-inf+ 6) +(defconstant +double-float-neg-inf+ 7) +(defconstant +double-float-nan+ 8) + +(defconstant +long-float-inf+ 9) +(defconstant +long-float-neg-inf+ 10) +(defconstant +long-float-nan+ 11) + (defvar *special-floats* nil) +;; Implementations are to provide an implementation for the create-float-value +;; function +(defun create-float-values (value &rest codes) + "Returns a alist of special float to float code mappings." + nil) + +(defun setup-special-floats () + (setf *special-floats* + (nconc (create-float-values most-negative-short-float +short-float-inf+ + +short-float-neg-inf+ +short-float-nan+) + (create-float-values most-negative-single-float +single-float-inf+ + +single-float-neg-inf+ +single-float-nan+) + (create-float-values most-negative-double-float +double-float-inf+ + +double-float-neg-inf+ +double-float-nan+) + (create-float-values most-negative-long-float +long-float-inf+ + +long-float-neg-inf+ +long-float-nan+)))) + (defstore-cl-store (obj float stream) (declare (optimize speed)) (block body @@ -189,7 +212,8 @@ #'(lambda (err) (declare (ignore err)) (when-let (type (cdr (assoc obj *special-floats*))) - (output-type-code type stream) + (output-type-code +special-float-code+ stream) + (write-byte type stream) (return-from body))))) (multiple-value-setq (significand exponent sign) (integer-decode-float obj)) @@ -200,7 +224,6 @@ (store-object exponent stream) (store-object sign stream))))) - (defrestore-cl-store (float stream) (float (* (the float (get-float-type (read-byte stream))) (* (the integer (restore-object stream)) @@ -208,33 +231,9 @@ (the integer (restore-object stream)))) (the integer (restore-object stream))))) -(defun handle-special-float (code name) - (aif (rassoc code *special-floats*) - (car it) - (store-error "~A Cannot be represented." name))) - -(defrestore-cl-store (negative-infinity stream) - (handle-special-float +negative-infinity-code+ - "Single Float Negative Infinity")) - -(defrestore-cl-store (positive-infinity stream) - (handle-special-float +positive-infinity-code+ - "Single Float Positive Infinity")) - -(defrestore-cl-store (nan-float stream) - (handle-special-float +float-nan-code+ "Single Float NaN")) - -(defrestore-cl-store (negative-double-infinity stream) - (handle-special-float +negative-double-infinity-code+ - "Double Float Negative Infinity")) - -(defrestore-cl-store (positive-double-infinity stream) - (handle-special-float +positive-double-infinity-code+ - "Double Float Positive Infinity")) - -(defrestore-cl-store (float-double-nan stream) - (handle-special-float +float-double-nan-code+ - "Double Float NaN")) +(defrestore-cl-store (special-float stream) + (or (car (rassoc (read-byte stream) *special-floats*)) + (restore-error "Float ~S is not a valid special float."))) ;; ratio --- /project/cl-store/cvsroot/cl-store/tests.lisp 2006/12/11 21:44:02 1.28 +++ /project/cl-store/cvsroot/cl-store/tests.lisp 2006/12/14 18:15:41 1.29 @@ -1,6 +1,5 @@ ;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- ;; See the file LICENCE for licence information. - (defpackage :cl-store-tests (:use :cl :regression-test :cl-store)) --- /project/cl-store/cvsroot/cl-store/utils.lisp 2006/12/11 21:44:02 1.23 +++ /project/cl-store/cvsroot/cl-store/utils.lisp 2006/12/14 18:15:41 1.24 @@ -81,15 +81,18 @@ ;; because clisp doesn't have the class single-float or double-float. (defun float-type (float) - (typecase float + (etypecase float (single-float 0) (double-float 1) - (t 0))) + (short-float 2) + (long-float 3))) (defun get-float-type (num) (ecase num (0 1.0) - (1 1.0d0))) + (1 1.0d0) + (2 1.0s0) + (3 1.0l0))) (deftype ub32 () `(unsigned-byte 32))

1 0

[cl-store-cvs] CVS cl-store
by sross 11 Dec '06

11 Dec '06

Update of /project/cl-store/cvsroot/cl-store In directory clnet:/tmp/cvs-serv9039 Modified Files: .cvsignore ChangeLog cl-store.asd default-backend.lisp tests.lisp utils.lisp Log Message: Changelog 2006-12-11 and 2006-10-01 --- /project/cl-store/cvsroot/cl-store/.cvsignore 2004/12/02 10:31:54 1.3 +++ /project/cl-store/cvsroot/cl-store/.cvsignore 2006/12/11 21:44:02 1.4 @@ -6,3 +6,6 @@ *.lib clean.sh wc.sh +*.fsl +*.ofasl +*.ufasl --- /project/cl-store/cvsroot/cl-store/ChangeLog 2006/08/03 19:42:09 1.41 +++ /project/cl-store/cvsroot/cl-store/ChangeLog 2006/12/11 21:44:02 1.42 @@ -1,5 +1,13 @@ +2006-12-11 Sean Ross <sross(a)common-lisp.net> + * lispworks/custom.lisp: Began work on new special float creation. + * .cvsignore : Update ignorable files + +2006-10-01 Sean Ross <sross(a)common-lisp.net> + * utils.lisp: Fix mkstr to upcase args. + 2006-08-03 Sean Ross <sross(a)common-lisp.net> * lispworks/custom.lisp: Fix float handling for Lispworks 5.0 . + * utils.lisp: changed references to compute-slots to class-slots. * package.lisp: Removed symbols from export list that are no longer used. --- /project/cl-store/cvsroot/cl-store/cl-store.asd 2006/08/03 19:42:09 1.38 +++ /project/cl-store/cvsroot/cl-store/cl-store.asd 2006/12/11 21:44:02 1.39 @@ -45,8 +45,7 @@ :name "CL-STORE" :author "Sean Ross <sross(a)common-lisp.net>" :maintainer "Sean Ross <sross(a)common-lisp.net>" - :version "0.6.10" - :compatible-with "0.6.2<=?<0.6.10" + :version "0.7.3" :description "Serialization package" :long-description "Portable CL Package to serialize data" :licence "MIT" --- /project/cl-store/cvsroot/cl-store/default-backend.lisp 2006/08/03 19:42:09 1.35 +++ /project/cl-store/cvsroot/cl-store/default-backend.lisp 2006/12/11 21:44:02 1.36 @@ -200,6 +200,7 @@ (store-object exponent stream) (store-object sign stream))))) + (defrestore-cl-store (float stream) (float (* (the float (get-float-type (read-byte stream))) (* (the integer (restore-object stream)) @@ -503,6 +504,7 @@ (simple-vector (store-simple-vector obj stream)) (t (store-array obj stream)))) + (defun store-array (obj stream) (declare (optimize speed (safety 0) (debug 0)) (type array obj)) @@ -543,7 +545,7 @@ (setting (row-major-aref obj pos) (restore-object stream))))))) (defun store-simple-vector (obj stream) - (declare (optimize speed (safety 1) (debug 0)) + (declare (optimize speed (safety 0) (debug 0)) (type simple-vector obj)) (output-type-code +simple-vector-code+ stream) (store-object (length obj) stream) --- /project/cl-store/cvsroot/cl-store/tests.lisp 2006/08/03 19:42:09 1.27 +++ /project/cl-store/cvsroot/cl-store/tests.lisp 2006/12/11 21:44:02 1.28 @@ -45,6 +45,8 @@ (deftestit complex.5 #C(-111 -1123)) (deftestit complex.6 #C(-11.2 -34.5)) +;; short floats + ;; single-float (deftestit single-float.1 3244.32) @@ -61,6 +63,8 @@ (deftestit double-float.5 most-positive-double-float) (deftestit double-float.6 most-negative-double-float) +;; long floats + ;; infinite floats #+(or sbcl cmu lispworks allegro) (progn @@ -184,7 +188,7 @@ (deftestit cons.4 '(1 . 2)) (deftestit cons.5 '(t . nil)) (deftestit cons.6 '(1 2 3 . 5)) -(deftest cons.7 (let ((list (cons nil nil))) ; '#1=(#1#))) +(deftest cons.7 (let ((list (cons nil nil))) (setf (car list) list) (store list *test-file*) (let ((ret (restore *test-file*))) --- /project/cl-store/cvsroot/cl-store/utils.lisp 2006/08/03 19:42:09 1.22 +++ /project/cl-store/cvsroot/cl-store/utils.lisp 2006/12/11 21:44:02 1.23 @@ -139,7 +139,7 @@ (defun mkstr (&rest args) (with-output-to-string (s) (dolist (x args) - (princ x s)))) + (format s "~@:(~A~)" x)))) (defun symbolicate (&rest syms) "Concatenate all symbol names into one big symbol" @@ -150,7 +150,7 @@ (defun safe-length (list) "Similar to `list-length', but avoid errors on improper lists. Return two values: the length of the list and the last cdr. -Modified to work on circular lists." +Modified to work on non proper lists." (do ((n 0 (+ n 2)) ;Counter. (fast list (cddr fast)) ;Fast pointer: leaps by 2. (slow list (cdr slow))) ;Slow pointer: leaps by 1.

1 0

[cl-store-cvs] CVS cl-store/lispworks
by sross 11 Dec '06

11 Dec '06

Update of /project/cl-store/cvsroot/cl-store/lispworks In directory clnet:/tmp/cvs-serv9039/lispworks Modified Files: .cvsignore custom.lisp Log Message: Changelog 2006-12-11 and 2006-10-01 --- /project/cl-store/cvsroot/cl-store/lispworks/.cvsignore 2004/10/06 14:41:40 1.1 +++ /project/cl-store/cvsroot/cl-store/lispworks/.cvsignore 2006/12/11 21:44:03 1.2 @@ -1 +1,11 @@ +*.fasl +*.x86f *.ufsl +filetest.cls +*.fas +*.lib +clean.sh +wc.sh +*.fsl +*.ofasl +*.ufasl --- /project/cl-store/cvsroot/cl-store/lispworks/custom.lisp 2006/08/03 19:42:09 1.7 +++ /project/cl-store/cvsroot/cl-store/lispworks/custom.lisp 2006/12/11 21:44:03 1.8 @@ -4,29 +4,19 @@ (in-package :cl-store) ;; Setup special floats -(defvar +single-positive-infinity+ most-positive-single-float) -(defvar +single-negative-infinity+ most-negative-single-float) -(defvar +single-nan+) - -(defvar +double-positive-infinity+ most-positive-double-float) -(defvar +double-negative-infinity+ most-negative-double-float) -(defvar +double-nan+) - -(setf +single-positive-infinity+ (expt +single-positive-infinity+ 2)) -(setf +single-negative-infinity+ (expt +single-negative-infinity+ 3)) -(setf +single-nan+ (/ +single-negative-infinity+ +single-negative-infinity+)) -(setf +double-positive-infinity+ (expt +double-positive-infinity+ 2)) -(setf +double-negative-infinity+ (expt +double-negative-infinity+ 3)) -(setf +double-nan+ (/ +double-negative-infinity+ +double-negative-infinity+)) - -(setf *special-floats* - (list (cons +double-positive-infinity+ +positive-double-infinity-code+) - (cons +single-positive-infinity+ +positive-infinity-code+) - - (cons +single-negative-infinity+ +negative-infinity-code+) - (cons +double-negative-infinity+ +negative-double-infinity-code+) - (cons +single-nan+ +float-nan-code+) - (cons +double-nan+ +float-double-nan-code+))) +(defun create-float-values (value &rest codes) + (let ((neg-inf (expt value 3))) + (mapcar 'cons + (list (expt (abs value) 2) + neg-inf + (/ neg-inf neg-inf)) + codes))) + +(defparameter *special-floats* + (nconc (create-float-values most-negative-single-float +positive-infinity-code+ + +negative-infinity-code+ +float-nan-code+) + (create-float-values most-negative-double-float +positive-double-infinity-code+ + +negative-double-infinity-code+ +float-double-nan-code+))) ;; Custom structure storing from Alain Picard. (defstore-cl-store (obj structure-object stream)

1 0

[cl-store-cvs] CVS cl-store
by sross 03 Aug '06

03 Aug '06

Update of /project/cl-store/cvsroot/cl-store In directory clnet:/tmp/cvs-serv14422 Modified Files: ChangeLog cl-store.asd default-backend.lisp package.lisp tests.lisp utils.lisp Log Message: --- /project/cl-store/cvsroot/cl-store/ChangeLog 2006/03/14 10:58:59 1.40 +++ /project/cl-store/cvsroot/cl-store/ChangeLog 2006/08/03 19:42:09 1.41 @@ -1,3 +1,8 @@ +2006-08-03 Sean Ross <sross(a)common-lisp.net> + * lispworks/custom.lisp: Fix float handling for Lispworks 5.0 . + * package.lisp: Removed symbols from export list that are no + longer used. + 2006-03-13 Sean Ross <sross(a)common-lisp.net> * sbcl/custom.lisp: Fixed sbcl structure definition storing for versions >= 0.9.6.25 . --- /project/cl-store/cvsroot/cl-store/cl-store.asd 2006/03/14 10:58:59 1.37 +++ /project/cl-store/cvsroot/cl-store/cl-store.asd 2006/08/03 19:42:09 1.38 @@ -30,7 +30,7 @@ pathname))) (defmethod perform ((op compile-op) (component non-required-file)) - (when (probe-file (component-pathname component)) + (when (probe-file (component-pathname component)) ; (call-next-method))) (defmethod perform ((op load-op) (component non-required-file)) @@ -46,6 +46,7 @@ :author "Sean Ross <sross(a)common-lisp.net>" :maintainer "Sean Ross <sross(a)common-lisp.net>" :version "0.6.10" + :compatible-with "0.6.2<=?<0.6.10" :description "Serialization package" :long-description "Portable CL Package to serialize data" :licence "MIT" --- /project/cl-store/cvsroot/cl-store/default-backend.lisp 2006/03/14 09:34:09 1.34 +++ /project/cl-store/cvsroot/cl-store/default-backend.lisp 2006/08/03 19:42:09 1.35 @@ -185,7 +185,7 @@ (declare (optimize speed)) (block body (let (significand exponent sign) - (handler-bind ((simple-error + (handler-bind (((or simple-error arithmetic-error) #'(lambda (err) (declare (ignore err)) (when-let (type (cdr (assoc obj *special-floats*))) --- /project/cl-store/cvsroot/cl-store/package.lisp 2005/11/30 09:49:56 1.23 +++ /project/cl-store/cvsroot/cl-store/package.lisp 2006/08/03 19:42:09 1.24 @@ -1,19 +1,19 @@ ;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- ;; See the file LICENCE for licence information. -;(in-package :cl-store.system) +(in-package :cl-store.system) (defpackage #:cl-store (:use #:cl) (:export #:backend #:magic-number #:stream-type #:restorers #:resolving-backend #:find-backend #:defbackend #:*restore-counter* #:*need-to-fix* #:*restored-values* - #:with-backend #:fix-circularities #:*default-backend* + #:with-backend #:*default-backend* #:*current-backend* #:*store-class-slots* #:*nuke-existing-classes* #:*store-class-superclasses* #:cl-store-error #:store-error #:restore-error #:store #:restore #:backend-store #:store-backend-code #:store-object - #:backend-store-object #:get-class-details #:get-array-values + #:backend-store-object #:restore #:backend-restore #:cl-store #:referrerp #:check-magic-number #:get-next-reader #:int-or-char-p #:restore-object #:backend-restore-object #:serializable-slots @@ -21,7 +21,7 @@ #:output-type-code #:store-referrer #:resolving-object #:internal-store-object #:setting #:simple-standard-string #:float-type #:get-float-type #:make-referrer #:setting-hash - #:multiple-value-store #:*postfix-setters* #:caused-by + #:multiple-value-store #:caused-by #:store-32-bit #:read-32-bit #:*check-for-circs* #:*store-hash-size* #:*restore-hash-size* #:get-slot-details #:*store-used-packages* #:*nuke-existing-packages* --- /project/cl-store/cvsroot/cl-store/tests.lisp 2006/03/14 09:34:09 1.26 +++ /project/cl-store/cvsroot/cl-store/tests.lisp 2006/08/03 19:42:09 1.27 @@ -642,7 +642,7 @@ (with-backend backend (regression-test:do-tests)) (when (probe-file *test-file*) - (delete-file *test-file*))) + (ignore-errors (delete-file *test-file*)))) ;; EOF --- /project/cl-store/cvsroot/cl-store/utils.lisp 2006/03/14 09:34:09 1.21 +++ /project/cl-store/cvsroot/cl-store/utils.lisp 2006/08/03 19:42:09 1.22 @@ -33,16 +33,16 @@ (:documentation "Return a list of slot-definitions to serialize. The default calls compute slots with class") (:method ((object t) (class standard-class)) - (compute-slots class)) + (class-slots class)) #+(or sbcl cmu openmcl) (:method ((object t) (class structure-class)) - (compute-slots class)) + (class-slots class)) #+sbcl (:method ((object t) (class sb-pcl::condition-class)) - (compute-slots class)) + (class-slots class)) #+cmu (:method ((object t) (class pcl::condition-class)) - (compute-slots class))) + (class-slots class))) ; Generify get-slot-details for customization (from Thomas Stenhaug)

1 0

[cl-store-cvs] CVS cl-store/lispworks
by sross 03 Aug '06

03 Aug '06

Update of /project/cl-store/cvsroot/cl-store/lispworks In directory clnet:/tmp/cvs-serv14422/lispworks Modified Files: custom.lisp Log Message: --- /project/cl-store/cvsroot/cl-store/lispworks/custom.lisp 2005/02/11 12:00:41 1.6 +++ /project/cl-store/cvsroot/cl-store/lispworks/custom.lisp 2006/08/03 19:42:09 1.7 @@ -4,18 +4,29 @@ (in-package :cl-store) ;; Setup special floats -(defvar +positive-infinity+ (expt most-positive-double-float 2)) -(defvar +negative-infinity+ (expt most-negative-double-float 3)) -(defvar +nan-float+ (/ +negative-infinity+ +negative-infinity+)) +(defvar +single-positive-infinity+ most-positive-single-float) +(defvar +single-negative-infinity+ most-negative-single-float) +(defvar +single-nan+) + +(defvar +double-positive-infinity+ most-positive-double-float) +(defvar +double-negative-infinity+ most-negative-double-float) +(defvar +double-nan+) + +(setf +single-positive-infinity+ (expt +single-positive-infinity+ 2)) +(setf +single-negative-infinity+ (expt +single-negative-infinity+ 3)) +(setf +single-nan+ (/ +single-negative-infinity+ +single-negative-infinity+)) +(setf +double-positive-infinity+ (expt +double-positive-infinity+ 2)) +(setf +double-negative-infinity+ (expt +double-negative-infinity+ 3)) +(setf +double-nan+ (/ +double-negative-infinity+ +double-negative-infinity+)) (setf *special-floats* - (list (cons +positive-infinity+ +positive-double-infinity-code+) - (cons +positive-infinity+ +positive-infinity-code+) - (cons +negative-infinity+ +negative-double-infinity-code+) - (cons +negative-infinity+ +negative-infinity-code+) - (cons +nan-float+ +float-double-nan-code+) - (cons +nan-float+ +float-nan-code+))) - + (list (cons +double-positive-infinity+ +positive-double-infinity-code+) + (cons +single-positive-infinity+ +positive-infinity-code+) + + (cons +single-negative-infinity+ +negative-infinity-code+) + (cons +double-negative-infinity+ +negative-double-infinity-code+) + (cons +single-nan+ +float-nan-code+) + (cons +double-nan+ +float-double-nan-code+))) ;; Custom structure storing from Alain Picard. (defstore-cl-store (obj structure-object stream)

1 0

[cl-store-cvs] CVS cl-store/sbcl
by sross 14 Mar '06

14 Mar '06

Update of /project/cl-store/cvsroot/cl-store/sbcl In directory clnet:/tmp/cvs-serv24791/sbcl Modified Files: custom.lisp Log Message: Whoops, remove errant symbol. --- /project/cl-store/cvsroot/cl-store/sbcl/custom.lisp 2006/03/14 10:58:59 1.11 +++ /project/cl-store/cvsroot/cl-store/sbcl/custom.lisp 2006/03/14 11:02:32 1.12 @@ -118,7 +118,6 @@ "0.9.6.25") (pushnew :defstruct-has-source-location *features*)))) -asdf::version-satisfies (defun sb-kernel-defstruct (dd supers source) (declare (ignorable source)) #+defstruct-has-source-location

1 0

[cl-store-cvs] CVS cl-store/sbcl
by sross 14 Mar '06

14 Mar '06

Update of /project/cl-store/cvsroot/cl-store/sbcl In directory clnet:/tmp/cvs-serv22833/sbcl Modified Files: custom.lisp Log Message: Fixed structure definition storing for more recent sbcl versions. --- /project/cl-store/cvsroot/cl-store/sbcl/custom.lisp 2005/10/04 08:14:02 1.10 +++ /project/cl-store/cvsroot/cl-store/sbcl/custom.lisp 2006/03/14 10:58:59 1.11 @@ -101,11 +101,36 @@ (funcall (compile nil `(lambda () ,@(sbcl-struct-defs dd)))) (find-class (dd-name dd))) +;; From 0.9.6.25 sb-kernel::%defstruct +;; takes a source location as a third argument. +(eval-when (:compile-toplevel) + (labels ((make-version (string) + (map-into (make-list 4 :initial-element 0) + #'parse-integer + (asdf::split string nil '(#\.)))) + (version>= (v1 v2) + (loop for x in (make-version v1) + for y in (make-version v2) + when (> x y) :do (return t) + when (> y x) :do (return nil) + finally (return t)))) + (when (version>= (lisp-implementation-version) + "0.9.6.25") + (pushnew :defstruct-has-source-location *features*)))) + +asdf::version-satisfies +(defun sb-kernel-defstruct (dd supers source) + (declare (ignorable source)) + #+defstruct-has-source-location + (sb-kernel::%defstruct dd supers source) + #-defstruct-has-source-location + (sb-kernel::%defstruct dd supers)) + (defun sbcl-define-structure (dd supers) (cond ((or *nuke-existing-classes* (not (find-class (dd-name dd) nil))) ;; create-struct - (sb-kernel::%defstruct dd supers) + (sb-kernel-defstruct dd supers nil) ;; compiler stuff (sb-kernel::%compiler-defstruct dd supers) ;; create make-?

1 0

[cl-store-cvs] CVS cl-store
by sross 14 Mar '06

14 Mar '06

Update of /project/cl-store/cvsroot/cl-store In directory clnet:/tmp/cvs-serv22833 Modified Files: cl-store.asd ChangeLog Log Message: Fixed structure definition storing for more recent sbcl versions. --- /project/cl-store/cvsroot/cl-store/cl-store.asd 2006/03/14 09:34:09 1.36 +++ /project/cl-store/cvsroot/cl-store/cl-store.asd 2006/03/14 10:58:59 1.37 @@ -45,7 +45,7 @@ :name "CL-STORE" :author "Sean Ross <sross(a)common-lisp.net>" :maintainer "Sean Ross <sross(a)common-lisp.net>" - :version "0.6.9" + :version "0.6.10" :description "Serialization package" :long-description "Portable CL Package to serialize data" :licence "MIT" --- /project/cl-store/cvsroot/cl-store/ChangeLog 2006/03/14 09:34:09 1.39 +++ /project/cl-store/cvsroot/cl-store/ChangeLog 2006/03/14 10:58:59 1.40 @@ -1,4 +1,8 @@ 2006-03-13 Sean Ross <sross(a)common-lisp.net> + * sbcl/custom.lisp: Fixed sbcl structure definition + storing for versions >= 0.9.6.25 . + +2006-03-13 Sean Ross <sross(a)common-lisp.net> * utils.lisp, tests.lisp, openmcl/custom.lisp: Added support for structure object storing for OpenMCL. Thanks to Kilian Sprotte for the code.

1 0

[cl-store-cvs] CVS cl-store
by sross 14 Mar '06

14 Mar '06

Update of /project/cl-store/cvsroot/cl-store In directory clnet:/tmp/cvs-serv11996 Modified Files: utils.lisp tests.lisp default-backend.lisp cl-store.asd ChangeLog Log Message: Added custom structure object storing for OpenMCL Thanks to Kilian Sprotte. --- /project/cl-store/cvsroot/cl-store/utils.lisp 2005/11/30 09:49:56 1.20 +++ /project/cl-store/cvsroot/cl-store/utils.lisp 2006/03/14 09:34:09 1.21 @@ -12,9 +12,6 @@ `(let ,(mapcar #'(lambda (x) `(,x (gensym))) names) ,@body)) -(defun mappend (fn &rest lsts) - (apply #'append (apply #'mapcar fn lsts))) - (defgeneric serializable-slots (object) (declare (optimize speed)) (:documentation @@ -23,7 +20,7 @@ and the objects class") (:method ((object standard-object)) (serializable-slots-using-class object (class-of object))) -#+(or sbcl cmu) +#+(or sbcl cmu openmcl) (:method ((object structure-object)) (serializable-slots-using-class object (class-of object))) (:method ((object condition)) @@ -37,7 +34,7 @@ The default calls compute slots with class") (:method ((object t) (class standard-class)) (compute-slots class)) -#+(or sbcl cmu) +#+(or sbcl cmu openmcl) (:method ((object t) (class structure-class)) (compute-slots class)) #+sbcl @@ -54,8 +51,8 @@ (:documentation "Return a list of slot details which can be used as an argument to ensure-class") - (:method ((slot-definition #+(or ecl clisp) t - #-(or ecl clisp) slot-definition)) + (:method ((slot-definition #+(or ecl (and clisp (not mop))) t + #-(or ecl (and clisp (not mop))) slot-definition)) (list :name (slot-definition-name slot-definition) :allocation (slot-definition-allocation slot-definition) :initargs (slot-definition-initargs slot-definition) @@ -63,7 +60,18 @@ ;; serialize functions :readers (slot-definition-readers slot-definition) :type (slot-definition-type slot-definition) - :writers (slot-definition-writers slot-definition)))) + :writers (slot-definition-writers slot-definition))) + #+openmcl + (:method ((slot-definition ccl::structure-slot-definition)) + (list :name (slot-definition-name slot-definition) + :allocation (slot-definition-allocation slot-definition) + :initargs (slot-definition-initargs slot-definition) + ;; :initform. dont use initform until we can + ;; serialize functions + ;; :readers (slot-definition-readers slot-definition) + :type (slot-definition-type slot-definition) + ;; :writers (slot-definition-writers slot-definition) + ))) (defmacro when-let ((var test) &body body) `(let ((,var ,test)) --- /project/cl-store/cvsroot/cl-store/tests.lisp 2005/09/09 14:59:17 1.25 +++ /project/cl-store/cvsroot/cl-store/tests.lisp 2006/03/14 09:34:09 1.26 @@ -330,11 +330,11 @@ (defstruct (b (:include a)) d e f) -#+(or sbcl cmu lispworks) +#+(or sbcl cmu lispworks openmcl) (deftestit structure-object.1 (make-a :a 1 :b 2 :c 3)) -#+(or sbcl cmu lispworks) +#+(or sbcl cmu lispworks openmcl) (deftestit structure-object.2 (make-b :a 1 :b 2 :c 3 :d 4 :e 5 :f 6)) -#+(or sbcl cmu lispworks) +#+(or sbcl cmu lispworks openmcl) (deftestit structure-object.3 (make-b :a 1 :b (make-a :a 1 :b 3 :c 2) :c #\Space :d #(1 2 3) :e (list 1 2 3) :f (make-hash-table))) --- /project/cl-store/cvsroot/cl-store/default-backend.lisp 2005/11/30 09:49:56 1.33 +++ /project/cl-store/cvsroot/cl-store/default-backend.lisp 2006/03/14 09:34:09 1.34 @@ -466,9 +466,11 @@ (meta (restore-object stream)) (keywords '(:direct-slots :direct-superclasses :metaclass)) - (final (mappend #'list keywords (list slots - (or supers (list 'standard-object)) - meta)))) + (final (loop for keyword in keywords + for slot in (list slots + (or supers (list 'standard-object)) + meta) + nconc (list keyword slot)))) (cond ((find-class class nil) (cond (*nuke-existing-classes* (apply #'ensure-class class final) --- /project/cl-store/cvsroot/cl-store/cl-store.asd 2005/11/30 09:49:56 1.35 +++ /project/cl-store/cvsroot/cl-store/cl-store.asd 2006/03/14 09:34:09 1.36 @@ -9,13 +9,18 @@ (in-package #:cl-store.system) +#-(or lispworks mcl cmu clisp sbcl allegro ecl openmcl) +(error "This is an unsupported lisp implementation. +Currently only MCL, OpenMCL, Lispworks, CMUCL, SBCL, +CLISP, ECL and AllegroCL are supported.") + (defclass non-required-file (cl-source-file) () (:documentation "File containing implementation dependent code which may or may not be there.")) (defun lisp-system-shortname () #+mcl :mcl #+lispworks :lispworks #+cmu :cmucl #+clisp :clisp #+sbcl :sbcl - #+allegro :acl #+ecl :ecl) + #+allegro :acl #+ecl :ecl #+openmcl :openmcl) (defmethod component-pathname ((component non-required-file)) (let ((pathname (call-next-method)) @@ -38,9 +43,9 @@ (defsystem cl-store :name "CL-STORE" - :author "Sean Ross <sdr(a)jhb.ucs.co.za>" - :maintainer "Sean Ross <sdr(a)jhb.ucs.co.za>" - :version "0.6.8" + :author "Sean Ross <sross(a)common-lisp.net>" + :maintainer "Sean Ross <sross(a)common-lisp.net>" + :version "0.6.9" :description "Serialization package" :long-description "Portable CL Package to serialize data" :licence "MIT" --- /project/cl-store/cvsroot/cl-store/ChangeLog 2005/11/30 09:49:56 1.38 +++ /project/cl-store/cvsroot/cl-store/ChangeLog 2006/03/14 09:34:09 1.39 @@ -1,3 +1,11 @@ +2006-03-13 Sean Ross <sross(a)common-lisp.net> + * utils.lisp, tests.lisp, openmcl/custom.lisp: Added + support for structure object storing for OpenMCL. + Thanks to Kilian Sprotte for the code. + * default-backend.lisp, utils.lisp: Changed creation + of class initargs to use loop instead of mappend. + Removed mappend. + 2005-11-30 Sean Ross <sross(a)common-lisp.net> * package.lisp: Added imports for MCL (from Gary King) * backends.lisp: Changed definition of the defstore-? and

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

cl-store-cvs